diff options
| author |  corysmith <corysmith@google.com> | 2017-07-25 23:48:52 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-07-26 10:35:05 +0200 |
| commit | 1dc4c710ec577ca34742aeeb09a634dec21bef68 (patch) | |
| tree | cbef962a035399193abc6fbb23a7890ab8fa289f /src | |
| parent | 8ea7685bd4db755be6c600dc1f800fc0af3a9771 (diff) | |
Add the android.jar to the validate and link step for aapt2.
RELNOTES: None.
PiperOrigin-RevId: 163126457
Diffstat (limited to 'src')
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java index 9a061a7ff0..e91c94d26a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceValidatorActionBuilder.java @@ -155,7 +155,7 @@ public class AndroidResourceValidatorActionBuilder { FluentIterable<Artifact> libraries = FluentIterable.from(resourceDeps.getResources()).transform( - ResourceContainer::getStaticLibrary); + ResourceContainer::getStaticLibrary).append(sdk.getAndroidJar()); builder .add("--libraries") 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 cdecfb9dcf..7297d9258c 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 @@ -1481,7 +1481,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { useConfiguration("--android_sdk=//sdk:sdk"); ConfiguredTarget a = getConfiguredTarget("//java/a:a"); - ConfiguredTarget b = getConfiguredTarget("//java/a:b"); + ConfiguredTarget b = getDirectPrerequisite(a, "//java/a:b"); + ConfiguredTarget sdk = getDirectPrerequisite(a, "//sdk:sdk"); SpawnAction compileAction = getGeneratingSpawnAction( getImplicitOutputArtifact(a, AndroidRuleClasses.ANDROID_COMPILED_SYMBOLS)); @@ -1491,8 +1492,10 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { getGeneratingSpawnAction( getImplicitOutputArtifact(a, AndroidRuleClasses.ANDROID_RESOURCES_AAPT2_LIBRARY_APK)); assertThat(linkAction).isNotNull(); + assertThat(linkAction.getInputs()) .containsAllOf( + sdk.getProvider(AndroidSdkProvider.class).getAndroidJar(), getImplicitOutputArtifact(a, AndroidRuleClasses.ANDROID_COMPILED_SYMBOLS), getImplicitOutputArtifact( b, a.getConfiguration(), AndroidRuleClasses.ANDROID_RESOURCES_AAPT2_LIBRARY_APK)); |