diff options
author | ahumesky <ahumesky@google.com> | 2018-01-19 13:24:01 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-19 13:25:32 -0800 |
commit | 3215117dc5372c103459a6cd21274fc756e5a9c9 (patch) | |
tree | 645ffc54383e28c25f81d592fc29374dc21cd704 /src/test/java/com/google/devtools | |
parent | 486085832490cef59762c0e76f3d6b6e7231f295 (diff) |
Make createMainDexProguardSpec public.
RELNOTES: None.
PiperOrigin-RevId: 182579590
Diffstat (limited to 'src/test/java/com/google/devtools')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/BUILD | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java index 7d4d6ec7a5..85a842f99b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidMultidexBaseTest.java @@ -21,6 +21,7 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; +import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.MultidexMode; import java.util.Set; import org.junit.Before; @@ -64,14 +65,19 @@ public class AndroidMultidexBaseTest extends BuildViewTestCase { // Only created in legacy mode: Artifact strippedJar = getFirstArtifactEndingWith(artifacts, "main_dex_intermediate.jar"); Artifact mainDexList = getFirstArtifactEndingWith(artifacts, "main_dex_list.txt"); + String ruleName = Label.parseAbsolute(ruleLabel).getName(); + Artifact mainDexProguardSpec = getFirstArtifactEndingWith( + artifacts, "main_dex_" + ruleName + "_proguard.cfg"); if (multidexMode == MultidexMode.LEGACY) { // First action: check that the stripped jar is generated through Proguard. + assertThat(mainDexProguardSpec).isNotNull(); AndroidSdkProvider sdk = AndroidSdkProvider.fromRuleContext(getRuleContext(binary)); assertThat(strippedJar).isNotNull(); SpawnAction stripAction = getGeneratingSpawnAction(strippedJar); assertThat(stripAction.getCommandFilename()) .isEqualTo(sdk.getProguard().getExecutable().getExecPathString()); + assertThat(stripAction.getInputs()).contains(mainDexProguardSpec); // Second action: The dexer consumes the stripped jar to create the main dex class list. assertThat(mainDexList).isNotNull(); diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD index 243880898c..7f93fb6374 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD @@ -254,6 +254,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:syntax", "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//src/test/java/com/google/devtools/build/lib:packages_testutil", |