commit a239c67ed3984e8481a5341f05bc86c49f7db827
author Luca Stefani <luca.stefani.ge1@gmail.com> Thu Aug 01 13:15:19 2019 +0200
committer Luca Stefani <luca.stefani.ge1@gmail.com> Thu Aug 01 16:29:06 2019 +0200
tree a21087ace8bcb879b1e5889da7938195b73c4aaa
parent 9a1d60f5cb08e455e201cee61c4f2be6f2b6712d

Add missing aapt2 dep in appcompat-files

* When soong_app_prebuilt calls appcompat-header
  with appcompat enabled aapt2 was missing

Test: m SystemUI
Change-Id: I26bcb507f68902ff95a1045dfeb22dd8d4913a92

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index e44f51d..16bec84 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2322,6 +2322,7 @@
   PACKAGING=$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING ANDROID_LOG_TAGS="*:e" $(ART_VERIDEX_APPCOMPAT_SCRIPT) --dex-file=$@ --api-flags=$(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) 2>&1 >> $(PRODUCT_OUT)/appcompat/$(PRIVATE_MODULE).log
 endef
 appcompat-files = \
+  $(AAPT2) \
   $(ART_VERIDEX_APPCOMPAT_SCRIPT) \
   $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) \
   $(HOST_OUT_EXECUTABLES)/veridex \