commit dd71c85a452af4269c947797b68027c2d663d4ef
author Ying Wang <wangying@google.com> Fri Dec 04 13:59:18 2015 -0800
committer Adam Lesinski <adamlesinski@google.com> Mon Jan 25 22:41:43 2016 -0800
tree 1092f88cdb9a38a654cfda3871fb61eea85b0880
parent b7a9e8ed90855e89c3e99cbbae65f162ee2b268c

Support to build with AAPT2

To build with AAPT2, set "USE_AAPT2=true".
TODO: Support split apks and generated resources from other than renderscript.

Bug: 25958912
Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc

core/android_manifest.mk

diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 582bad4..b945ea9 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -22,9 +22,12 @@
 my_full_libs_manifest_files += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
   $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/AndroidManifest.xml)
 
+# With USE_AAPT2, we'll link in the built resource from the AAR.
+ifndef USE_AAPT2
 LOCAL_RESOURCE_DIR += $(foreach lib, $(LOCAL_STATIC_JAVA_AAR_LIBRARIES),\
   $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/aar/res)
-endif
+endif  # USE_AAPT2
+endif  # LOCAL_STATIC_JAVA_AAR_LIBRARIES
 
 # Set up rules to merge library manifest files
 ifdef my_full_libs_manifest_files