commit 981de838d4d352ef32de5ae69c58f2ae04fd39ed
author Adam Lesinski <adamlesinski@google.com> Thu Mar 16 04:53:05 2017 +0000
committer Adam Lesinski <adamlesinski@google.com> Thu Mar 16 04:53:05 2017 +0000
tree fb30f0940bce366d979490746c4a780c12128488
parent 79326762158236f09c844d5ce241f4d93bfa2ca4

Add LOCAL_ASSET_DIR support (-A) to aapt2

Although performing the inclusion of assets/ at a later stage is
preferable, (since aapt just copies the files) do the easy thing and
support what aapt did. In the future perhaps we can zip up the
assets/ directories when also merging in the classes.dex.

Bug: 35461578
Change-Id: I7d7fde43333ea6455c4a1b9113bd25e1d88b7dd5
Test: manual

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 10ee297..dc54bfe 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2110,6 +2110,7 @@
   $(addprefix --manifest ,$(PRIVATE_ANDROID_MANIFEST)) \
   $(addprefix -I ,$(PRIVATE_AAPT_INCLUDES)) \
   $(addprefix -I ,$(PRIVATE_SHARED_ANDROID_LIBRARIES)) \
+  $(addprefix -A ,$(PRIVATE_ASSET_DIR)) \
   $(addprefix --java ,$(PRIVATE_SOURCE_INTERMEDIATES_DIR)) \
   $(addprefix --proguard ,$(PRIVATE_PROGUARD_OPTIONS_FILE)) \
   $(addprefix --min-sdk-version ,$(PRIVATE_DEFAULT_APP_TARGET_SDK)) \