diff options
| author |  Googler <noreply@google.com> | 2017-09-29 21:32:25 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-02 10:31:36 +0200 |
| commit | 6ff77f8f7b6b1617b1c20e4c63d1b597a95813d4 (patch) | |
| tree | 546a47678f05199fd29ea82b72990e9ab9405ecd /src/test/java/com/google/devtools/build/lib/rules | |
| parent | ae32398146a05ecbe60966b0fe16e409e7b3e3ae (diff) | |
Use intermediate compiled resource symbols for linking rather than static resource library APK's.
RELNOTES: none
PiperOrigin-RevId: 170517806
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/rules')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 b1b629a15e..01d58f9d5c 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 @@ -3241,7 +3241,7 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { assertThat(apkAction.getInputs()) .contains( - getImplicitOutputArtifact(b, AndroidRuleClasses.ANDROID_RESOURCES_AAPT2_LIBRARY_APK)); + getImplicitOutputArtifact(b, AndroidRuleClasses.ANDROID_COMPILED_SYMBOLS)); SpawnAction classAction = getGeneratingSpawnAction(classJar); assertThat(classAction.getInputs()) 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 1520db35b4..85d0263abf 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 @@ -1508,7 +1508,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { sdk.getProvider(AndroidSdkProvider.class).getAndroidJar(), getImplicitOutputArtifact(a, AndroidRuleClasses.ANDROID_COMPILED_SYMBOLS), getImplicitOutputArtifact( - b, a.getConfiguration(), AndroidRuleClasses.ANDROID_RESOURCES_AAPT2_LIBRARY_APK)); + b, a.getConfiguration(), AndroidRuleClasses.ANDROID_COMPILED_SYMBOLS)); assertThat(linkAction.getOutputs()) .containsAllOf( getImplicitOutputArtifact(a, AndroidRuleClasses.ANDROID_RESOURCES_AAPT2_R_TXT), |