From fff6f75fc1de2963254271d7d254e53ae187cada Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 11 Jul 2017 14:06:16 +0900 Subject: [PATCH] Use the legacy linker namespace configs when target is sanitized The new linker namespace config causes problem when the target is sanitized: vendor libs which are loaded in the sphal namespace can't link against to libclang_rt* libs which are in /system/lib directory because the directory is not allowed for sphal namsapce. Long-term solution would be installing libclang_rt* to both /system/lib and /vendor/lib so that vendor libs can link against to the one in /vendor/lib. Until the work is done, let's just disable the new linker namespace config when the target is to be sanitized. Bug: 63535130 Test: make SANITIZE_TARGET=integer_overflow SANITIZE_TARGET_DIAG=integer_overflow builds and boots to the UI Change-Id: I6afb69885aaa3d25e554b9ca699a572248bfc50a --- rootdir/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 2e5575fd0..046557eb2 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -194,7 +194,7 @@ bcp_dep := include $(CLEAR_VARS) LOCAL_MODULE := ld.config.txt -ifeq ($(PRODUCT_FULL_TREBLE),true) +ifeq ($(PRODUCT_FULL_TREBLE)|$(SANITIZE_TARGET),true|) LOCAL_SRC_FILES := etc/ld.config.txt else LOCAL_SRC_FILES := etc/ld.config.legacy.txt