Fix aapt2 actions to use the compiled intermediate resource files for linking. Also include assets in the aapt2 packaging action.

RELNOTES: none
PiperOrigin-RevId: 170532322

1 files changed, 10 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
index 2ddcdc9acc..5242aae0f4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java
@@ -147,18 +147,25 @@ public class Aapt2ResourcePackagingAction {
           AndroidResourceOutputs.copyManifestToOutput(compiled, options.manifestOutput);
         }
 
-        List<StaticLibrary> dependencies =
+        List<CompiledResources> compiledResourceDeps =
             // Last defined dependencies will overwrite previous one, so always place direct
             // after transitive.
             concat(options.transitiveData.stream(), options.directData.stream())
-                .map(DependencyAndroidData::getStaticLibrary)
+                .map(DependencyAndroidData::getCompiledSymbols)
                 .collect(toList());
 
+        List<Path> assetDirs =
+            concat(options.transitiveData.stream(), options.directData.stream())
+                .flatMap(dep -> dep.assetDirs.stream())
+                .collect(toList());
+        assetDirs.addAll(options.primaryData.assetDirs);
+
         final PackagedResources packagedResources =
             ResourceLinker.create(aaptConfigOptions.aapt2, linkedOut)
                 .profileUsing(profiler)
                 .dependencies(ImmutableList.of(StaticLibrary.from(aaptConfigOptions.androidJar)))
-                .include(dependencies)
+                .include(compiledResourceDeps)
+                .withAssets(assetDirs)
                 .buildVersion(aaptConfigOptions.buildToolsVersion)
                 .filterToDensity(densitiesToFilter)
                 .link(compiled)