diff options
Diffstat (limited to 'src/test/java/com')
4 files changed, 14 insertions, 18 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 151466a026..cb6e0c667a 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 @@ -187,7 +187,6 @@ public final class BazelAnalysisMock extends AnalysisMock { " main_dex_classes = ':mainDexClasses.rules',", " main_dex_list_creator = ':main_dex_list_creator',", " proguard = ':ProGuard',", - " resource_extractor = ':resource_extractor',", " shrinked_android_jar = ':shrinkedAndroid.jar',", " zipalign = ':zipalign',", ")", 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 58086d46da..3ed9a39ee1 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 @@ -432,7 +432,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor'", ")", "java_library(", " name = 'aidl_runtime',", @@ -492,7 +491,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor'", ")", "java_library(", " name = 'aidl_runtime',", @@ -665,7 +663,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { private void actualSignerToolTests(String apkSigningMethod, String signV1, String signV2) throws Exception { - scratch.file("sdk/BUILD", + scratch.file( + "sdk/BUILD", "android_sdk(", " name = 'sdk',", " aapt = 'aapt',", @@ -680,8 +679,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " main_dex_list_creator = 'main_dex_list_creator',", " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", - " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor')"); + " zipalign = 'zipalign')"); scratch.file("java/com/google/android/hello/BUILD", "android_binary(name = 'hello',", " srcs = ['Foo.java'],", @@ -2145,7 +2143,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { @Test public void testMainDexListWithAndroidSdk() throws Exception { - scratch.file("sdk/BUILD", + scratch.file( + "sdk/BUILD", "android_sdk(", " name = 'sdk',", " aapt = 'aapt',", @@ -2160,8 +2159,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " main_dex_list_creator = 'main_dex_list_creator',", " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", - " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor')"); + " zipalign = 'zipalign')"); scratch.file("java/a/BUILD", "android_binary(", @@ -2181,7 +2179,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { @Test public void testMainDexAaptGenerationSupported() throws Exception { - scratch.file("sdk/BUILD", + scratch.file( + "sdk/BUILD", "android_sdk(", " name = 'sdk',", " build_tools_version = '24.0.0',", @@ -2197,8 +2196,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { " main_dex_list_creator = 'main_dex_list_creator',", " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", - " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor')"); + " zipalign = 'zipalign')"); scratch.file("java/a/BUILD", "android_binary(", @@ -2889,7 +2887,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { .containsAllOf("--nocompress_suffixes", ".apk", ".so") .inOrder(); } - + @Test public void testAndroidBinaryWithTestOnlySetsTestOnly() throws Exception { scratch.file( 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 7ba05dafc2..ab4a1c1eac 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 @@ -567,7 +567,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { @Test public void testAidlLibAddsProguardSpecs() throws Exception { - scratch.file("sdk/BUILD", + scratch.file( + "sdk/BUILD", "android_sdk(name = 'sdk',", " aapt = 'aapt',", " adb = 'adb',", @@ -582,8 +583,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " main_dex_list_creator = 'main_dex_list_creator',", " proguard = 'proguard',", " shrinked_android_jar = 'shrinked_android_jar',", - " zipalign = 'zipalign',", - " resource_extractor = 'resource_extractor')", + " zipalign = 'zipalign')", "java_library(name = 'aidl_lib',", " srcs = ['AidlLib.java'],", " proguard_specs = ['aidl_lib.cfg'])"); 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 4abdc5c4e7..2c68717cb3 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 @@ -67,8 +67,7 @@ public class ApkManifestActionTest { null, // apkBuilder, optional createFilesToRunProvider("apkSigner"), createFilesToRunProvider("proguard"), - createFilesToRunProvider("zipalign"), - createFilesToRunProvider("resourceExtractor")); + createFilesToRunProvider("zipalign")); Iterable<Artifact> jars1 = ImmutableList.of( createArtifact("/workspace/java/test/output_jar1"), |