Merge "Include hwasan lib and runtime on arm64 system images"
This commit is contained in:
@@ -1252,6 +1252,7 @@ define product-installed-files
|
||||
$(if $(filter tests,$(tags_to_install)),$(call get-product-var,$(1),PRODUCT_PACKAGES_TESTS)) \
|
||||
$(if $(filter asan,$(tags_to_install)),$(call get-product-var,$(1),PRODUCT_PACKAGES_DEBUG_ASAN)) \
|
||||
$(if $(filter java_coverage,$(tags_to_install)),$(call get-product-var,$(1),PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE)) \
|
||||
$(if $(filter arm64,$(TARGET_ARCH) $(TARGET_2ND_ARCH)),$(call get-product-var,$(1),PRODUCT_PACKAGES_ARM64)) \
|
||||
$(call auto-included-modules) \
|
||||
) \
|
||||
$(eval ### Filter out the overridden packages and executables before doing expansion) \
|
||||
|
@@ -36,6 +36,7 @@ _product_list_vars += PRODUCT_HOST_PACKAGES
|
||||
_product_list_vars += PRODUCT_PACKAGES
|
||||
_product_list_vars += PRODUCT_PACKAGES_DEBUG
|
||||
_product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN
|
||||
_product_list_vars += PRODUCT_PACKAGES_ARM64
|
||||
# Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true
|
||||
_product_list_vars += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE
|
||||
_product_list_vars += PRODUCT_PACKAGES_ENG
|
||||
|
Reference in New Issue
Block a user