diff options
author | corysmith <corysmith@google.com> | 2017-08-10 20:34:02 +0200 |
---|---|---|
committer | Marcel Hlopko <hlopko@google.com> | 2017-08-11 12:56:18 +0200 |
commit | e7e7ba4d6f250899165bb8862fefa4e90a33da57 (patch) | |
tree | 675b78d5edc34b3ad6847dfe3fbf62d3c9d5a411 /src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java | |
parent | a664a5118e552504ba7962e1cccfea43b51ef28e (diff) |
Adds aapt2.ResourceCompiler and CompileLibraryResourcesAction.
Refactorings:
* Change data binding to have configurable archive generation
* Extract a ZipBuilder class from the ZipBuilderVisitor to provide a general purpose archiving class.
* Small changes to visibility AaptCommandLineBuilder for reuse in the aapt2 code.
RELNOTES: None
PiperOrigin-RevId: 164880571
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java index 935ffa0f3a..6840ac8cc4 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMergingAction.java @@ -265,11 +265,13 @@ public class AndroidResourceMergingAction { if (options.resourcesOutput != null) { Path resourcesDir = AndroidResourceProcessor.processDataBindings( + tmp.resolve("res_no_binding"), mergedData.getResourceDir(), options.dataBindingInfoOut, packageType, options.packageForR, - options.primaryManifest); + options.primaryManifest, + true); // For now, try compressing the library resources that we pass to the validator. This takes // extra CPU resources to pack and unpack (~2x), but can reduce the zip size (~4x). |