StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d9a am: b98ff26c7d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526599

Change-Id: I4ea6e13d7297e5b6546475bd55428c1bec6a5fbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Florian Mayer
2023-04-14 23:55:55 +00:00
committed by Automerger Merge Worker
parent 074bfc1264 b98ff26c7d
commit aca0515f1b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@@ -1252,6 +1252,7 @@ define product-installed-files
$(if $(filter tests,$(tags_to_install)),$(call get-product-var,$(1),PRODUCT_PACKAGES_TESTS)) \ $(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 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 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) \ $(call auto-included-modules) \
) \ ) \
$(eval ### Filter out the overridden packages and executables before doing expansion) \ $(eval ### Filter out the overridden packages and executables before doing expansion) \

1
core/product.mk
View File

@@ -36,6 +36,7 @@ _product_list_vars += PRODUCT_HOST_PACKAGES
_product_list_vars += PRODUCT_PACKAGES _product_list_vars += PRODUCT_PACKAGES
_product_list_vars += PRODUCT_PACKAGES_DEBUG _product_list_vars += PRODUCT_PACKAGES_DEBUG
_product_list_vars += PRODUCT_PACKAGES_DEBUG_ASAN _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 # 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_DEBUG_JAVA_COVERAGE
_product_list_vars += PRODUCT_PACKAGES_ENG _product_list_vars += PRODUCT_PACKAGES_ENG

8
target/product/base_system.mk
View File

@@ -296,11 +296,9 @@ PRODUCT_PACKAGES += \
system_manifest.xml \ system_manifest.xml \
system_compatibility_matrix.xml \ system_compatibility_matrix.xml \
# HWASAN runtime for SANITIZE_TARGET=hwaddress builds PRODUCT_PACKAGES_ARM64 := libclang_rt.hwasan \
ifneq (,$(filter hwaddress,$(SANITIZE_TARGET))) libclang_rt.hwasan.bootstrap \
PRODUCT_PACKAGES += \ libc_hwasan \
libclang_rt.hwasan.bootstrap
endif
# Jacoco agent JARS to be built and installed, if any. # Jacoco agent JARS to be built and installed, if any.
ifeq ($(EMMA_INSTRUMENT),true) ifeq ($(EMMA_INSTRUMENT),true)