diff options
Diffstat (limited to 'core/soong_app_prebuilt.mk')
-rw-r--r-- | core/soong_app_prebuilt.mk | 23 |
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)) |
75 | endif | 75 | endif |
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. | ||
79 | module_run_appcompat := | ||
80 | ifeq (true,$(filter true, \ | ||
81 | $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \ | ||
82 | $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE))) | ||
83 | ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) # ! unbundled app build | ||
84 | module_run_appcompat := true | ||
85 | endif | ||
86 | endif | ||
87 | |||
88 | ifeq ($(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) | ||
96 | else | ||
97 | $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE))) | ||
98 | endif | ||
78 | 99 | ||
79 | my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\ | 100 | my_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))) |