From 9b79db5ebfe42ba826548e90d7dee52d2cc88285 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 11 Dec 2018 10:20:33 +0000 Subject: [PATCH] Revert "Add Android Runtime APEX lib directories to the system linker configuration." This reverts commit 2f56b1fff8b1936b267a3ed17844fcaf8eaca73d. Reason for revert: Breaks bionic-unit-tests's dlfcn.dladdr_libc and x86 CtsJniTestCases' JniStaticTest.test_linker_namespaces. Bug: 113373927 Bug: 120661824 Change-Id: I9b34bcb240a42bf99c6d8b58db4b18a4f6d36961 --- rootdir/etc/ld.config.txt | 11 +++-------- rootdir/etc/ld.config.vndk_lite.txt | 9 ++------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/rootdir/etc/ld.config.txt b/rootdir/etc/ld.config.txt index 041f6d890..d3e80c992 100644 --- a/rootdir/etc/ld.config.txt +++ b/rootdir/etc/ld.config.txt @@ -38,8 +38,7 @@ additional.namespaces = sphal,vndk,rs ############################################################################### namespace.default.isolated = true -namespace.default.search.paths = /apex/com.android.runtime/${LIB} -namespace.default.search.paths += /system/${LIB} +namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} @@ -76,7 +75,6 @@ namespace.default.permitted.paths += /data namespace.default.permitted.paths += /mnt/expand namespace.default.asan.search.paths = /data/asan/system/${LIB} -namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} @@ -339,13 +337,11 @@ namespace.vndk.link.default.allow_all_shared_libs = true ############################################################################### namespace.system.isolated = false -namespace.system.search.paths = /apex/com.android.runtime/${LIB} -namespace.system.search.paths += /system/${LIB} +namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /%PRODUCT%/${LIB} namespace.system.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.system.asan.search.paths = /data/asan/system/${LIB} -namespace.system.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.system.asan.search.paths += /system/${LIB} namespace.system.asan.search.paths += /data/asan/product/${LIB} namespace.system.asan.search.paths += /%PRODUCT%/${LIB} @@ -362,7 +358,6 @@ namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} ############################################################################### [postinstall] namespace.default.isolated = false -namespace.default.search.paths = /apex/com.android.runtime/${LIB} -namespace.default.search.paths += /system/${LIB} +namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} diff --git a/rootdir/etc/ld.config.vndk_lite.txt b/rootdir/etc/ld.config.vndk_lite.txt index 6a53b0321..7e354aca6 100644 --- a/rootdir/etc/ld.config.vndk_lite.txt +++ b/rootdir/etc/ld.config.vndk_lite.txt @@ -38,15 +38,13 @@ additional.namespaces = sphal,vndk,rs ############################################################################### namespace.default.isolated = false -namespace.default.search.paths = /apex/com.android.runtime/${LIB} -namespace.default.search.paths += /system/${LIB} +namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /odm/${LIB} namespace.default.search.paths += /vendor/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.asan.search.paths = /data/asan/system/${LIB} -namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /data/asan/odm/${LIB} namespace.default.asan.search.paths += /odm/${LIB} @@ -213,7 +211,6 @@ namespace.default.search.paths += /vendor/${LIB}/vndk-sp # Access to system libraries are allowed namespace.default.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% -namespace.default.search.paths += /apex/com.android.runtime/${LIB} namespace.default.search.paths += /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} @@ -235,7 +232,6 @@ namespace.default.asan.search.paths += /system/${LIB}/vndk%VNDK_VER% namespace.default.asan.search.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER% namespace.default.asan.search.paths += /system/${LIB}/vndk-sp%VNDK_VER% namespace.default.asan.search.paths += /data/asan/system/${LIB} -namespace.default.asan.search.paths += /apex/com.android.runtime/${LIB} namespace.default.asan.search.paths += /system/${LIB} namespace.default.asan.search.paths += /data/asan/product/${LIB} namespace.default.asan.search.paths += /%PRODUCT%/${LIB} @@ -252,7 +248,6 @@ namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} ############################################################################### [postinstall] namespace.default.isolated = false -namespace.default.search.paths = /apex/com.android.runtime/${LIB} -namespace.default.search.paths += /system/${LIB} +namespace.default.search.paths = /system/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}