diff options
author | Googler <noreply@google.com> | 2018-06-08 15:53:50 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-06-08 15:55:33 -0700 |
commit | 9c68c3a1bd50ee56b5b7592a5f2ff918b16a2bab (patch) | |
tree | 6462d61e72ef6a2cf9565df1eb4219cbc81fb910 /src/test/java/com | |
parent | 6dfafd27facf11700047a9be56b8c7a3f201829a (diff) |
Automated rollback of commit 5df8eb24f84a6943e70876c805c77f06e719dcd7.
PiperOrigin-RevId: 199864175
Diffstat (limited to 'src/test/java/com')
-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, 30 insertions, 1 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 af2220d0f6..3b7579909b 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,7 +272,8 @@ 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("android_tools_defaults_jar(name = 'android_jar')") + .add("sh_binary(name = 'dex_list_obfuscator', srcs = ['empty.sh'])"); 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 f894e4d32b..b073452b0e 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,6 +180,34 @@ 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_obfuscated.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',", |