From 2dae6f035e0bac71860b82f8ab2bdbf2d29c9c3a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 5 Feb 2019 12:36:58 +0000 Subject: [PATCH] Fix asan paths in ld.config As of Id663c5f284e3b4fc65ed8cb8c2da6bcf6542e034, the asan libs are in the TARGET_COPY_OUT_X subpath of the /data/asan/ dir, rather than just 'x' unconditionally. Test: presubmit Change-Id: I3a515791e237ad10703415ea532c7a089660d8e9 --- rootdir/etc/ld.config.txt | 4 ++-- rootdir/etc/ld.config.vndk_lite.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 9bf90580b..60c4f78ca 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -78,9 +78,9 @@ namespace.default.permitted.paths += /system/${LIB}/bootstrap namespace.default.asan.search.paths = /data/asan/system/${LIB} namespace.default.asan.search.paths += /system/${LIB} -namespace.default.asan.search.paths += /data/asan/product/${LIB} +namespace.default.asan.search.paths += /data/asan/%PRODUCT%/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} -namespace.default.asan.search.paths += /data/asan/product_services/${LIB} +namespace.default.asan.search.paths += /data/asan/%PRODUCT_SERVICES%/${LIB} namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.asan.permitted.paths = /data diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index ca180c065..190444592 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -50,9 +50,9 @@ namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} namespace.default.asan.search.paths += /data/asan/vendor/${LIB} namespace.default.asan.search.paths += /vendor/${LIB} -namespace.default.asan.search.paths += /data/asan/product/${LIB} +namespace.default.asan.search.paths += /data/asan/%PRODUCT%/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} -namespace.default.asan.search.paths += /data/asan/product_services/${LIB} +namespace.default.asan.search.paths += /data/asan/%PRODUCT_SERVICES%/${LIB} namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} # Keep in sync with the platform namespace in the com.android.runtime APEX