Use assets from the APK for resource shrinking rather than from the merge actions.

RELNOTES: none
PiperOrigin-RevId: 179227857

1 files changed, 4 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 c2ddb7cd9f..f2bfba4787 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
@@ -195,14 +195,15 @@ public class Aapt2ResourcePackagingAction {
           profiler.startTask("package");
           // The compiled resources and the merged resources should be the same.
           // TODO(corysmith): Decompile or otherwise provide the exact resources in the apk.
-          ResourcesZip.from(
+          ResourcesZip.fromApk(
                   mergedAndroidData.getResourceDir(),
-                  mergedAndroidData.getAssetDir(),
-                  packagedResources.resourceIds())
+                  packagedResources.getApk(),
+                  packagedResources.getResourceIds())
               .writeTo(options.resourcesOutput, false /* compress */);
           profiler.recordEndOf("package");
         }
       }
     }
   }
+
 }