Skip to content

Commit

Permalink
Re-add @bazel_tools//third_party/jarjar
Browse files Browse the repository at this point in the history
`third_party/jarjar` was moved out of the `@bazel_tools` when the Java tools were moved to a remote repository. Adding the package back because there are users referencing it directly.

Fixes #7767.

Closes #7785.

PiperOrigin-RevId: 239595898
  • Loading branch information
iirina authored and katre committed Mar 21, 2019
1 parent e9831a8 commit 607d78d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ JAVA_TOOLS = [
"//third_party/ijar:zipper",
"//third_party/ijar:embedded_tools",
"//third_party/java/jacoco:srcs",
"//third_party/jarjar:embedded_build_and_license",
] + select({
"//src/conditions:arm": [],
"//conditions:default": [
Expand Down
2 changes: 2 additions & 0 deletions src/create_embedded_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
('*ijar', lambda x: 'tools/jdk/ijar/ijar'),
('*zipper.exe', lambda x: 'tools/zip/zipper/zipper.exe'),
('*zipper', lambda x: 'tools/zip/zipper/zipper'),
('*third_party/jarjar/BUILD.tools', lambda x: 'third_party/jarjar/BUILD'),
('*third_party/jarjar/LICENSE', lambda x: 'third_party/jarjar/LICENSE'),
('*src/objc_tools/*',
lambda x: 'tools/objc/precomp_' + os.path.basename(x)),
('*xcode*StdRedirect.dylib', lambda x: 'tools/objc/StdRedirect.dylib'),
Expand Down
14 changes: 7 additions & 7 deletions tools/jdk/BUILD
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
load(
"//tools/jdk:default_java_toolchain.bzl",
"default_java_toolchain",
"java_runtime_files",
"JDK8_JVM_OPTS",
"bootclasspath",
"default_java_toolchain",
"java_runtime_files",
)
load(
"//tools/jdk:java_toolchain_alias.bzl",
"java_toolchain_alias",
"java_runtime_alias",
"java_host_runtime_alias",
"legacy_java_toolchain_alias",
"java_runtime_alias",
"java_toolchain_alias",
"legacy_java_runtime_alias",
"legacy_java_toolchain_alias",
)

package(default_visibility = ["//visibility:public"])
Expand Down Expand Up @@ -400,9 +400,9 @@ alias(
actual = "//third_party/java/jacoco:blaze-agent",
)

java_import(
remote_java_tools_java_import(
name = "JarJar",
jars = [":jarjar_command_deploy.jar"],
target = ":JarJar",
)

test_suite(
Expand Down

0 comments on commit 607d78d

Please sign in to comment.