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

Commit c6d2cf86 authored by Logan Chien's avatar Logan Chien
Browse files

Fix linker_asan[64] apex bootstrap build error 

This commit fixes `linker_asan[64]` apex bootstrap build errors.
Without this change, `make -j SANITIZE_TARGET=address` results in:

  FAILED: ninja: 'out/target/product/walleye/system/bin/linker_asan64',
  needed by 'out/target/product/walleye/system/bin/app_process64',
  missing and no known rule to make it

Test: lunch aosp_walleye-userdebug && make SANITIZE_TARGET=address
Change-Id: I980a36499cd327db307321fc8e4548925e7d56bf
parent 9d1aab10

core/clang/TARGET_arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt 


# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan

core/clang/TARGET_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ TARGET_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.builtins-aarch64-androi 


# Address sanitizer clang config

ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64

ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan64

core/clang/TARGET_mips.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.p 


# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan

core/clang/TARGET_mips64.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mips64el-android. 


# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan64

core/clang/TARGET_x86.mk

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt 


# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER_FILE := /system/bin/bootstrap/linker_asan