Remove remnants of apkbuilder from Android tests.
They are unused now that --use_singlejar_apkbuilder is the default.
RELNOTES: None
PiperOrigin-RevId: 152746425
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 9f4b07112f..73b07a9 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
@@ -124,11 +124,6 @@
Iterables.toArray(createToolsAndroidEmulatorContents(), String.class));
config.create(
- "/bazel_tools_workspace/third_party/java/apkbuilder/BUILD",
- "sh_binary(name = 'embedded_apkbuilder',",
- " srcs = ['embedded_apkbuilder.sh'])");
-
- config.create(
"/bazel_tools_workspace/tools/genrule/BUILD", "exports_files(['genrule-setup.sh'])");
config.create(
"/bazel_tools_workspace/third_party/java/jarjar/BUILD",
@@ -181,7 +176,6 @@
" aidl = ':static_aidl_tool',",
" android_jar = ':android_runtime_jar',",
" annotations_jar = ':annotations_jar',",
- " apkbuilder = ':ApkBuilderMainBinary',",
" apksigner = ':ApkSignerBinary',",
" dx = ':dx_binary',",
" framework_aidl = ':aidl_framework',",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 8392ec8..ca032eb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -420,7 +420,6 @@
" aidl = 'aidl',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
@@ -481,7 +480,6 @@
" aidl = 'aidl',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
@@ -673,7 +671,6 @@
" aidl = 'aidl',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
@@ -1997,7 +1994,6 @@
" aidl = 'aidl',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
@@ -2036,7 +2032,6 @@
" aidl = 'aidl',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
index 7e874d4..ea30deb 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java
@@ -565,7 +565,6 @@
" aidl_lib = ':aidl_lib',",
" android_jar = 'android.jar',",
" annotations_jar = 'annotations_jar',",
- " apkbuilder = 'apkbuilder',",
" apksigner = 'apksigner',",
" dx = 'dx',",
" framework_aidl = 'framework_aidl',",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
index b882422..392c9e6 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java
@@ -61,7 +61,7 @@
createFilesToRunProvider("mainDexListCreator"),
createFilesToRunProvider("aidl"),
createFilesToRunProvider("aapt"),
- createFilesToRunProvider("apkBuilder"),
+ /* apkBuilder = */ null,
createFilesToRunProvider("apkSigner"),
createFilesToRunProvider("proguard"),
createFilesToRunProvider("zipalign"),
