Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 074dce31 authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d... 

Merge "Include hwasan lib and runtime on arm64 system images" am: ed97847d am: b98ff26c am: aca0515f

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



Change-Id: Ibd295e9a35a9494fae156090330274173cecab14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55decf2e aca0515f

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -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) \

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

target/product/base_system.mk

+3 −5
Original line number Diff line number Diff line
@@ -299,11 +299,9 @@ PRODUCT_PACKAGES += \ 
    system_manifest.xml \

    system_compatibility_matrix.xml \



# HWASAN runtime for SANITIZE_TARGET=hwaddress builds

ifneq (,$(filter hwaddress,$(SANITIZE_TARGET)))

  PRODUCT_PACKAGES += \

   libclang_rt.hwasan.bootstrap

endif

PRODUCT_PACKAGES_ARM64 := libclang_rt.hwasan \

 libclang_rt.hwasan.bootstrap \

 libc_hwasan \



# Jacoco agent JARS to be built and installed, if any.

ifeq ($(EMMA_INSTRUMENT),true)