Remove jarjar distribution.
Jarjar was removed from java_tools already (https://github.com/bazelbuild/bazel/pull/12491). This is cleanup of other dependencies.
Closes #12506.
PiperOrigin-RevId: 344071950
diff --git a/src/BUILD b/src/BUILD
index d6713d5..f00e228 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -110,7 +110,6 @@
JAVA_TOOLS = [
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:embedded_tools",
- "//third_party/jarjar:embedded_build_and_license",
]
# TODO(philwo): Clean this up, once a Bazel that can run py_binary and sh_binary
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index ccd19db..e8d96b3 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -36,15 +36,11 @@
('*tools/cpp/BUILD.tools', lambda x: 'tools/cpp/BUILD'),
('*tools/cpp/runfiles/generated_*',
lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]),
- ('*jarjar_command_deploy.jar',
- lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
('*BUILD.java_langtools', lambda x: 'third_party/java/jdk/langtools/BUILD'),
('*launcher.exe', lambda x: 'tools/launcher/launcher.exe'),
('*def_parser.exe', lambda x: 'tools/def_parser/def_parser.exe'),
('*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'),
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 0d86709..bae9925 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -396,7 +396,6 @@
.add("java_plugin(name = 'databinding_annotation_processor',")
.add(" generates_api = 1,")
.add(" processor_class = 'android.databinding.annotationprocessor.ProcessDataBinding')")
- .add("sh_binary(name = 'jarjar_bin', srcs = ['empty.sh'])")
.add("sh_binary(name = 'instrumentation_test_check', srcs = ['empty.sh'])")
.add("package_group(name = 'android_device_allowlist', packages = ['//...'])")
.add("package_group(name = 'export_deps_allowlist', packages = ['//...'])")
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index f9f7f1a..fc54e78 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -408,11 +408,6 @@
filegroup(name = "empty")
alias(
- name = "jarjar_bin",
- actual = "//third_party/java/jarjar:jarjar_bin",
-)
-
-alias(
name = "instrumentation_test_entry_point",
actual = "@android_test_support//:instrumentation_test_runner",
)
