commit 164a33f194ca6b89bec50404260637dab9a32074
author Colin Cross <ccross@android.com> Wed May 09 13:27:22 2018 -0700
committer Colin Cross <ccross@android.com> Wed May 09 23:56:19 2018 +0000
tree 34aa0737fa326ca189b3f3af541a8c24f1b11bff
parent 0fdbb4c91075d117032215c6967e5fcd81cfad9c

Fix zipped resources

Fix mismatch between output directory of zipsync and input
directory of aapt2.

Test: m checkbuild
Change-Id: If012c943af0c04cc3f0dd5c4266126412ae0a759

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 092a778..1463bc6 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2092,7 +2092,7 @@
 define aapt2-compile-resource-zips
 @mkdir -p $(dir $@)
 $(ZIPSYNC) -d $@.contents -l $@.list $(PRIVATE_SOURCE_RES_ZIPS)
-$(hide) $(AAPT2) compile -o $@ --dir $@.tmp $(PRIVATE_AAPT2_CFLAGS) --legacy
+$(hide) $(AAPT2) compile -o $@ --dir $@.contents $(PRIVATE_AAPT2_CFLAGS) --legacy
 endef
 
 # Set up rule to compile one resource file with aapt2.