Automated rollback of commit 70c2be189c9c0021f7c424c7399f8bdecc579b4e.

*** Reason for rollback ***

Broke some cakemix tap projects

*** Original change description ***

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

RELNOTES: none
PiperOrigin-RevId: 179252805

1 files changed, 3 insertions, 4 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 f2bfba4787..c2ddb7cd9f 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,15 +195,14 @@ 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.fromApk(
+          ResourcesZip.from(
                   mergedAndroidData.getResourceDir(),
-                  packagedResources.getApk(),
-                  packagedResources.getResourceIds())
+                  mergedAndroidData.getAssetDir(),
+                  packagedResources.resourceIds())
               .writeTo(options.resourcesOutput, false /* compress */);
           profiler.recordEndOf("package");
         }
       }
     }
   }
-
 }