aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2019-01-16 02:53:48 -0600
committerGerrit Code Review2019-01-16 02:53:48 -0600
commitd6dbd967b572d867593a90d1e26c16bd4b589a89 (patch)
treeb32c36bcbcf567c487c6923166e9dedb58c58e13
parent371f557f8ef8d2bdc8c28aa408af895d6f7df787 (diff)
parentf712ce79f5dbc49e0dda74f4fcc5c1bc9525f09c (diff)
downloadplatform-build-d6dbd967b572d867593a90d1e26c16bd4b589a89.tar.gz
platform-build-d6dbd967b572d867593a90d1e26c16bd4b589a89.tar.xz
platform-build-d6dbd967b572d867593a90d1e26c16bd4b589a89.zip
Merge "Execute appcompat for apps built from soong"
-rw-r--r--core/soong_app_prebuilt.mk23
1 files changed, 22 insertions, 1 deletions
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index f7236335b..91865bcc6 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -74,7 +74,28 @@ ifneq ($(BUILD_PLATFORM_ZIP),)
74 $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk)) 74 $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk))
75endif 75endif
76 76
77$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) 77# Run veridex on product, product_services and vendor modules.
78# We skip it for unbundled app builds where we cannot build veridex.
79module_run_appcompat :=
80ifeq (true,$(filter true, \
81 $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \
82 $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))
83ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build
84 module_run_appcompat := true
85endif
86endif
87
88ifeq ($(module_run_appcompat),true)
89 $(LOCAL_BUILT_MODULE): $(appcompat-files)
90 $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)
91 $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)
92 @echo "Copy: $@"
93 $(copy-file-to-target)
94 $(call appcompat-header, aapt2)
95 $(run-appcompat)
96else
97 $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))
98endif
78 99
79my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\ 100my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\
80 $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f))) 101 $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))