commit d638c5d27817b4b72e2a4f3bcff44b46440598c1
author Adam Lesinski <adamlesinski@google.com> Fri Jun 24 14:56:29 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Mon Jun 27 18:39:40 2016 +0000
tree a0eb7f7428fbf9de51db75e6a8585ae4857f0a22
parent 77f60a4abafa3dc8bf9cdaa64210d8867f678763

Support arg file list for -R in AAPT2

Bug:29462255
Change-Id: Ie5b9745c350d46f55bfcb42ff1e844685b9ded99

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 06cc623..91101e3 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2074,6 +2074,7 @@
 define aapt2-link
 @mkdir -p $(dir $@)
 $(call dump-words-to-file,$(PRIVATE_RES_FLAT),$(dir $@)aapt2-flat-list)
+$(call dump-words-to-file,$(PRIVATE_OVERLAY_FLAT),$(dir $@)aapt2-flat-overlay-list)
 $(hide) $(AAPT2) link -o $@ \
   $(PRIVATE_AAPT_FLAGS) \
   $(addprefix --manifest ,$(PRIVATE_ANDROID_MANIFEST)) \
@@ -2090,7 +2091,7 @@
   $(if $(filter --version-name,$(PRIVATE_AAPT_FLAGS)),,--version-name $(APPS_DEFAULT_VERSION_NAME)) \
   $(addprefix --rename-manifest-package ,$(PRIVATE_MANIFEST_PACKAGE_NAME)) \
   $(addprefix --rename-instrumentation-target-package ,$(PRIVATE_MANIFEST_INSTRUMENTATION_FOR)) \
-  $(addprefix -R , $(PRIVATE_OVERLAY_FLAT)) \
+  -R \@$(dir $@)aapt2-flat-overlay-list \
   \@$(dir $@)aapt2-flat-list
 endef