diff options
| author |  jmmv <jmmv@google.com> | 2018-06-07 20:04:23 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-07 20:05:39 -0700 |
| commit | 5df8eb24f84a6943e70876c805c77f06e719dcd7 (patch) | |
| tree | ec940fa8c3de452e746045df38747d0d2179727d /src/test | |
| parent | 499503bbfe192f109f05270e5391265c0cd0966f (diff) | |
Automated rollback of commit ccaccb2b277a82f7264567563a02ab133a0f6e6f.
*** Reason for rollback ***
Suspected root cause behind tons of Blaze nightly failures.
One example:
[]
*** Original change description ***
Let blaze obfuscate manual main_dex_list according to proguard map.
PiperOrigin-RevId: 199737371
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 3 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 28 |
2 files changed, 1 insertions, 30 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 3b7579909b..af2220d0f6 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 @@ -272,8 +272,7 @@ public final class BazelAnalysisMock extends AnalysisMock { .add("sh_binary(name = 'instrumentation_test_check', srcs = ['empty.sh'])") .add("package_group(name = 'android_device_whitelist', packages = ['//...'])") .add("package_group(name = 'export_deps_whitelist', packages = ['//...'])") - .add("android_tools_defaults_jar(name = 'android_jar')") - .add("sh_binary(name = 'dex_list_obfuscator', srcs = ['empty.sh'])"); + .add("android_tools_defaults_jar(name = 'android_jar')"); return androidBuildContents.build(); } 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 6c17d9465c..f894e4d32b 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 @@ -180,34 +180,6 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { } @Test - public void testMainDexListObfuscation() throws Exception { - useConfiguration("--noincremental_dexing"); - scratch.file("/java/a/list.txt"); - ConfiguredTarget ct = - scratchConfiguredTarget( - "java/a", - "a", - "android_binary(", - " name = 'a',", - " srcs = ['A.java'],", - " manifest = 'AndroidManifest.xml',", - " multidex = 'manual_main_dex',", - " proguard_generate_mapping = 1,", - " main_dex_list = 'list.txt')"); - - Artifact obfuscatedDexList = - artifactByPath( - ImmutableList.of(getCompressedUnsignedApk(ct)), - ".apk", - ".dex.zip", - ".dex.zip", - "main_dex_list.txt"); - List<String> args = getGeneratingSpawnActionArgs(obfuscatedDexList); - assertThat(args.get(0)).contains("dex_list_obfuscator"); - MoreAsserts.assertContainsSublist(args, "--input", "java/a/list.txt"); - } - - @Test public void testNonLegacyNativeDepsDoesNotPolluteDexSharding() throws Exception { scratch.file("java/a/BUILD", "android_binary(name = 'a',", |