From 6ff77f8f7b6b1617b1c20e4c63d1b597a95813d4 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 29 Sep 2017 21:32:25 +0200 Subject: Use intermediate compiled resource symbols for linking rather than static resource library APK's. RELNOTES: none PiperOrigin-RevId: 170517806 --- .../com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 2 +- .../com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/rules') 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), -- cgit v1.2.3