From f7b46a2eb1e9bea3d68726271dd7ed968961cb5c Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Tue, 12 Feb 2019 20:02:05 +0800 Subject: [PATCH] Fix APEX run-time ld.config.txt for ASAN targets This commit fixes the search paths for vendor binaries in ASAN targets. Test: Boot aosp_walleye-userdebug to home screen Change-Id: Id87ceee3c43098bd453f6fae4f32ea62355f922b --- rootdir/etc/ld.config.txt | 1 + rootdir/etc/ld.config.vndk_lite.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 7aa097dde..46ea13876 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -408,6 +408,7 @@ namespace.runtime.isolated = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.runtime.search.paths = /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.runtime.links = system # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library # when it exists. diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 190444592..286fdaee2 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -349,6 +349,7 @@ namespace.runtime.isolated = true # Keep in sync with ld.config.txt in the com.android.runtime APEX. namespace.runtime.search.paths = /apex/com.android.runtime/${LIB} +namespace.runtime.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.runtime.links = default # TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library # when it exists.