Skip to content

Commit

Permalink
Export recent changes to GitHub.
Browse files Browse the repository at this point in the history
Primarily, this means cl/511470745, but it probably includes bits from
cl/511754220, cl/509629252, cl/509559717, cl/506904697, cl/482820733,
and perhaps others.

PiperOrigin-RevId: 511754220
  • Loading branch information
google-noreply authored and cpovirk committed Feb 23, 2023
1 parent 2474fd0 commit 3f565fd
Show file tree
Hide file tree
Showing 14 changed files with 242 additions and 404 deletions.
11 changes: 8 additions & 3 deletions BUILD
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

licenses(["notice"]) # Apache License 2.0

load("//tools:maven.bzl", "pom_file")
load(":builddefs.bzl", "java_agent_binary")

licenses(["notice"])

exports_files(
["builddefs.bzl"],
)
Expand All @@ -20,6 +20,11 @@ java_agent_binary(
],
)

pom_file(
name = "pom",
targets = [":allocationinstrumenter"],
)

# Since some Java applications use different versions of ASM, we
# use JarJar to rename the ASM classes to something else, to avoid conflicts.
#
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "google_bazel_common",
strip_prefix = "bazel-common-e768dbfea5bac239734b3f59b2a1d7464c6dbd26",
urls = ["https://github.com/google/bazel-common/archive/e768dbfea5bac239734b3f59b2a1d7464c6dbd26.zip"],
sha256 = "17f66ba76073a290add024a4ce7f5f92883832b7da85ffd7677e1f5de9a36153",
strip_prefix = "bazel-common-a9e1d8efd54cbf27249695b23775b75ca65bb59d",
urls = ["https://github.com/google/bazel-common/archive/a9e1d8efd54cbf27249695b23775b75ca65bb59d.zip"],
sha256 = "e30e092e50c47a38994334dbe42386675cf519a5e86b973e45034323bbdb70a3",
)

load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")
Expand Down
10 changes: 2 additions & 8 deletions builddefs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ def java_agent_binary(
native.java_library(
name = library_name,
srcs = srcs,
javacopts = [
# ASM has some deprecated methods we really shouldn't be
# calling at all.
"-Xlint:deprecation",
"-Werror",
],
visibility = visibility,
deps = deps,
compatible_with = compatible_with,
Expand Down Expand Up @@ -121,10 +115,10 @@ def java_agent_binary(
name = library_name + "_asm_rename",
srcs = [library_name + "_internal_deploy.jar"],
outs = [library_name + "_internal_2_deploy.jar"],
cmd = "$(location @bazel_tools//third_party/jarjar:jarjar_bin) process $(location :jarjar_rules) '$<' '$@'",
cmd = "$(location @google_bazel_common//tools/jarjar) process $(location :jarjar_rules) '$<' '$@'",
tools = [
":jarjar_rules",
"@bazel_tools//third_party/jarjar:jarjar_bin",
"@google_bazel_common//tools/jarjar",
],
visibility = ["//visibility:private"],
compatible_with = compatible_with,
Expand Down
Loading

0 comments on commit 3f565fd

Please sign in to comment.