diff options
author | 2017-11-15 11:55:15 -0800 | |
---|---|---|
committer | 2017-11-15 11:57:13 -0800 | |
commit | 7925d5b265249466bff385602e94509a05de6870 (patch) | |
tree | 9543038c23171dd93261a792a6f0571591e3cb09 /src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java | |
parent | 1e0b7cb49b5d22f72d9e32018d15972a9f28878c (diff) |
Create merge action and data deserializer for aapt2 compiled resources.
RELNOTES: None
PiperOrigin-RevId: 175858467
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java index 40de32f0c2..f1da34a520 100644 --- a/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java +++ b/src/tools/android/java/com/google/devtools/build/android/ResourceProcessorBusyBox.java @@ -92,6 +92,12 @@ public class ResourceProcessorBusyBox { AndroidResourceMergingAction.main(args); } }, + MERGE_COMPILED() { + @Override + void call(String[] args) throws Exception { + AndroidCompiledResourceMergingAction.main(args); + } + }, GENERATE_AAR() { @Override void call(String[] args) throws Exception { @@ -159,7 +165,7 @@ public class ResourceProcessorBusyBox { "The processing tool to execute. " + "Valid tools: PACKAGE, VALIDATE, GENERATE_BINARY_R, GENERATE_LIBRARY_R, PARSE, " + "MERGE, GENERATE_AAR, SHRINK, MERGE_MANIFEST, COMPILE_LIBRARY_RESOURCES, " - + "LINK_STATIC_LIBRARY, AAPT2_PACKAGE, SHRINK_AAPT2." + + "LINK_STATIC_LIBRARY, AAPT2_PACKAGE, SHRINK_AAPT2, MERGE_COMPILED." ) public Tool tool; } |