diff options
| author |  ajmichael <ajmichael@google.com> | 2017-04-10 22:51:27 +0000 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-04-11 10:50:25 +0200 |
| commit | 8a8c2dba712b4318b41bd9ccdf53486c0746f762 (patch) | |
| tree | e24fef9e2db7e05408f4ec9314bd8ddd4a9d50a5 /src/test | |
| parent | 3334b253e8f0e59bbb3eb97a6de2a07dd4e64a25 (diff) | |
Remove remnants of apkbuilder from Android tests.
They are unused now that --use_singlejar_apkbuilder is the default.
RELNOTES: None
PiperOrigin-RevId: 152746425
Diffstat (limited to 'src/test')
4 files changed, 1 insertions, 13 deletions
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..73b07a9c16 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 @@ public final class BazelAnalysisMock extends AnalysisMock { 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 @@ public final class BazelAnalysisMock extends AnalysisMock { " 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 8392ec8b76..ca032eb389 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 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " aidl = 'aidl',", " android_jar = 'android.jar',", " annotations_jar = 'annotations_jar',", - " apkbuilder = 'apkbuilder',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -481,7 +480,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " aidl = 'aidl',", " android_jar = 'android.jar',", " annotations_jar = 'annotations_jar',", - " apkbuilder = 'apkbuilder',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -673,7 +671,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " aidl = 'aidl',", " android_jar = 'android.jar',", " annotations_jar = 'annotations_jar',", - " apkbuilder = 'apkbuilder',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -1997,7 +1994,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " aidl = 'aidl',", " android_jar = 'android.jar',", " annotations_jar = 'annotations_jar',", - " apkbuilder = 'apkbuilder',", " apksigner = 'apksigner',", " dx = 'dx',", " framework_aidl = 'framework_aidl',", @@ -2036,7 +2032,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " 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 7e874d4b8a..ea30deb73f 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 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " 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 b882422a1c..392c9e6453 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 @@ public class ApkManifestActionTest { createFilesToRunProvider("mainDexListCreator"), createFilesToRunProvider("aidl"), createFilesToRunProvider("aapt"), - createFilesToRunProvider("apkBuilder"), + /* apkBuilder = */ null, createFilesToRunProvider("apkSigner"), createFilesToRunProvider("proguard"), createFilesToRunProvider("zipalign"), |