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

Commit bf140974 authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

Move sanitized vendor libraries to /data/vendor/lib(|64). 

Sanitized RPATH now mentions /system/vendor/lib to preserve overlay
in the case when a sanitized version of a vendor library can not be
built.

Bug: 22199458
Change-Id: I3222d2e1d6c08fdd1e0404fcb7db347aa4a92bb7
parent 5df6b5c3

core/clang/TARGET_arm.mk

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


# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm-android

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RPATH := /data/lib
 
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RPATH := /data/vendor/lib:/$(TARGET_COPY_OUT_VENDOR)/lib:/data/lib

core/clang/TARGET_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -67,4 +67,4 @@ TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a 


# Address sanitizer clang config

ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm64-android

ADDRESS_SANITIZER_RPATH := /data/lib64
 
ADDRESS_SANITIZER_RPATH := /data/vendor/lib64:/$(TARGET_COPY_OUT_VENDOR)/lib64:/data/lib64

core/envsetup.mk

+8 −2
Original line number Diff line number Diff line
@@ -332,12 +332,18 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS := $(TARGET_OUT_DATA)/ 
TARGET_OUT_CACHE := $(PRODUCT_OUT)/cache



TARGET_OUT_VENDOR := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)

ifeq ($(SANITIZE_TARGET),address)

target_out_vendor_shared_libraries_base := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA)/vendor

else

target_out_vendor_shared_libraries_base := $(TARGET_OUT_VENDOR)

endif



TARGET_OUT_VENDOR_EXECUTABLES := $(TARGET_OUT_VENDOR)/bin

TARGET_OUT_VENDOR_OPTIONAL_EXECUTABLES := $(TARGET_OUT_VENDOR)/xbin

ifeq ($(TARGET_IS_64_BIT),true)

TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib64

TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib64

else

TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(TARGET_OUT_VENDOR)/lib

TARGET_OUT_VENDOR_SHARED_LIBRARIES := $(target_out_vendor_shared_libraries_base)/lib

endif

TARGET_OUT_VENDOR_JAVA_LIBRARIES := $(TARGET_OUT_VENDOR)/framework

TARGET_OUT_VENDOR_APPS := $(TARGET_OUT_VENDOR)/app