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

Commit b7b161fc authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "fix: boot fails on ASAN builds with VNDK restriction" into oc-mr1-dev am: 80206d8f 

am: 299591e4

Change-Id: I5cd5dee1902fccfcfd6fe26d3c250deafd1f2ba1
parents 2d532a7c 299591e4

rootdir/Android.mk

+11 −0
Original line number Diff line number Diff line
@@ -218,22 +218,33 @@ vndk_sameprocess_libraries := $(subst $(space),:,$(addsuffix .so,$(VNDK_SAMEPROC 


vndk_core_libraries := $(subst $(space),:,$(addsuffix .so,$(VNDK_CORE_LIBRARIES)))



sanitizer_runtime_libraries := $(subst $(space),:,$(addsuffix .so,\

$(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

$(UBSAN_RUNTIME_LIBRARY) \

$(TSAN_RUNTIME_LIBRARY) \

$(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

$(2ND_UBSAN_RUNTIME_LIBRARY) \

$(2ND_TSAN_RUNTIME_LIBRARY)))



$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(llndk_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(vndk_sameprocess_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_PRIVATE_LIBRARIES := $(llndk_private_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(vndk_core_libraries)

$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(sanitizer_runtime_libraries)

$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/ld.config.txt.in $(vndk_lib_dep)

	@echo "Generate: $< -> $@"

	@mkdir -p $(dir $@)

	$(hide) sed -e 's?%LLNDK_LIBRARIES%?$(PRIVATE_LLNDK_LIBRARIES)?g' $< >$@

	$(hide) sed -i -e 's?%VNDK_SAMEPROCESS_LIBRARIES%?$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES)?g' $@

	$(hide) sed -i -e 's?%VNDK_CORE_LIBRARIES%?$(PRIVATE_VNDK_CORE_LIBRARIES)?g' $@

	$(hide) sed -i -e 's?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g' $@



vndk_lib_md5 :=

vndk_lib_dep :=

llndk_libraries :=

vndk_sameprocess_libraries :=

vndk_core_libraries :=

sanitizer_runtime_libraries :=

else # if _enforce_vndk_at_runtime is not true



LOCAL_MODULE := ld.config.txt

rootdir/etc/ld.config.txt.in

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ namespace.sphal.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB} 
namespace.sphal.links = default,vndk,rs



# WARNING: only NDK libs can be listed here.

namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES%

namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES%



# WARNING: only VNDK-SP libs can be listed here. DO NOT EDIT this line.

namespace.sphal.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%
@@ -90,7 +90,7 @@ namespace.rs.asan.search.paths = /data/asan/vendor/${LIB}/vndk-sp:/vendor/${LIB} 
namespace.rs.asan.permitted.paths = /data/asan/vendor/${LIB}:/vendor/${LIB}:/data



namespace.rs.links = default,vndk

namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES%

namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES%

namespace.rs.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%



###############################################################################
@@ -109,7 +109,7 @@ namespace.vndk.asan.permitted.paths = /data/asan/vendor/${LIB}/hw:/vendor/${LIB} 
# to the default namespace. This is possible since their ABI is stable across

# Android releases.

namespace.vndk.links = default

namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES%

namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES%:%SANITIZER_RUNTIME_LIBRARIES%



###############################################################################

# Namespace config for vendor processes. In O, no restriction is enforced for