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

Commit d5226eea authored by Peter Collingbourne's avatar Peter Collingbourne Committed by android-build-merger
Browse files

Merge "Add "arm64-v8a-hwasan" to the supported ABI list in SANITIZE_TARGET=hwaddress builds." 

am: 0b8c15b2

Change-Id: I120e005f560f89d0276b8de73f1ee1e6681895a4
parents 66a0d43d 0b8c15b2

core/board_config.mk

+8 −0
Original line number Diff line number Diff line
@@ -206,6 +206,14 @@ ifeq (,$(TARGET_CPU_ABI_LIST_64_BIT)) 
  endif

endif



# "arm64-v8a-hwasan", the ABI for libraries compiled with HWASAN, is supported

# in all builds with SANITIZE_TARGET=hwaddress.

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

  ifneq ($(filter arm64-v8a,$(TARGET_CPU_ABI_LIST_64_BIT)),)

    TARGET_CPU_ABI_LIST_64_BIT := arm64-v8a-hwasan $(TARGET_CPU_ABI_LIST_64_BIT)

  endif

endif



ifeq (,$(TARGET_CPU_ABI_LIST_32_BIT))

  ifneq (true,$(TARGET_IS_64_BIT))

    TARGET_CPU_ABI_LIST_32_BIT := $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2)