Merge "Execute appcompat for apps built from soong"

  $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(dir $(LOCAL_BUILT_MODULE))package.dex.apk))

endif

# Run veridex on product, product_services and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

ifeq (true,$(filter true, \

   $(LOCAL_PRODUCT_MODULE) $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_VENDOR_MODULE) $(LOCAL_PROPRIETARY_MODULE)))

ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))  # ! unbundled app build

  module_run_appcompat := true

endif

endif

ifeq ($(module_run_appcompat),true)

  $(LOCAL_BUILT_MODULE): $(appcompat-files)

  $(LOCAL_BUILT_MODULE): PRIVATE_INSTALLED_MODULE := $(LOCAL_INSTALLED_MODULE)

  $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)

	@echo "Copy: $@"

	$(copy-file-to-target)

	$(call appcompat-header, aapt2)

	$(run-appcompat)

else

  $(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

endif

my_built_installed := $(foreach f,$(LOCAL_SOONG_BUILT_INSTALLED),\

  $(call word-colon,1,$(f)):$(PRODUCT_OUT)$(call word-colon,2,$(f)))