diff options
author | Googler <noreply@google.com> | 2017-12-20 09:29:45 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-20 10:39:56 -0800 |
commit | 241d6cad572f4ba67eb9cdcfddd3ac109c557f0f (patch) | |
tree | a3ef5a7b03a195752ccf602fefb524735f303cde /src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java | |
parent | 53d568de5ddd3b529c92d37c9112d15dd6844baa (diff) |
Use assets from the resource APK for resource shrinking rather than from the merge actions.
RELNOTES: none
PiperOrigin-RevId: 179695515
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/Aapt2ResourcePackagingAction.java | 7 |
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 90487a3c42..50d18c9c1c 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 @@ -194,14 +194,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"); } } } } + } |