ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bionic libs are located at /system/lib am: 3fa8415b37

Browse source 
am: 1c4851f223

Change-Id: Idc2f7c6f7928c25e47a0d62fbedb301bc2f094ad
This commit is contained in:
Jiyong Park 2019-01-11 09:35:40 -08:00 • committed by android-build-merger
commit 556a4a7d60
2 changed files with 16 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
rootdir/etc/ld.config.txt
View file

@ -109,8 +109,7 @@ namespace.default.asan.permitted.paths += /apex/com.android.resolv/${LIB}
# Keep in sync with ld.config.txt in the com.android.runtime APEX. # Keep in sync with ld.config.txt in the com.android.runtime APEX.
namespace.default.links = runtime namespace.default.links = runtime
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so namespace.default.link.runtime.shared_libs = libart.so:libartd.so
namespace.default.link.runtime.shared_libs += libart.so:libartd.so
namespace.default.link.runtime.shared_libs += libnativebridge.so namespace.default.link.runtime.shared_libs += libnativebridge.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so
@ -163,12 +162,8 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB}
# Once in this namespace, access to libraries in /system/lib is restricted. Only # Once in this namespace, access to libraries in /system/lib is restricted. Only
# libs listed here can be used. # libs listed here can be used.
namespace.sphal.links = runtime,default,vndk,rs namespace.sphal.links = default,vndk,rs
namespace.sphal.link.runtime.shared_libs = libc.so:libdl.so:libm.so
# LLNDK_LIBRARIES includes the runtime libs above, but the order here ensures
# that they are loaded from the runtime namespace.
namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES% namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES%
namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -215,9 +210,7 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB}
namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB}
namespace.rs.asan.permitted.paths += /data namespace.rs.asan.permitted.paths += /data
namespace.rs.links = runtime,default,vndk namespace.rs.links = default,vndk
namespace.rs.link.runtime.shared_libs = libc.so:libdl.so:libm.so
namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES% namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES%
namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -265,13 +258,10 @@ namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl
namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER%/hw namespace.vndk.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp%VNDK_VER%/hw
namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp%VNDK_VER%/hw namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp%VNDK_VER%/hw
# The "vndk" namespace links to "runtime" for Bionic libs, "default" namespace # The "vndk" namespace links to "default" namespace for LLNDK libs and links to
# for LLNDK libs, and links to "sphal" namespace for vendor libs. The ordering # "sphal" namespace for vendor libs. The ordering matters. The "default"
# matters. The "default" namespace has higher priority than the "sphal" # namespace has higher priority than the "sphal" namespace.
# namespace. namespace.vndk.links = default,sphal
namespace.vndk.links = runtime,default,sphal
namespace.vndk.link.runtime.shared_libs = libc.so:libdl.so:libm.so
# When these NDK libs are required inside this namespace, then it is redirected # When these NDK libs are required inside this namespace, then it is redirected
# to the default namespace. This is possible since their ABI is stable across # to the default namespace. This is possible since their ABI is stable across
@ -290,7 +280,7 @@ namespace.vndk.link.sphal.allow_all_shared_libs = true
# (LL-NDK only) access. # (LL-NDK only) access.
############################################################################### ###############################################################################
[vendor] [vendor]
additional.namespaces = runtime,system,vndk additional.namespaces = system,vndk
############################################################################### ###############################################################################
# "default" namespace # "default" namespace
@ -321,23 +311,11 @@ namespace.default.asan.permitted.paths += /odm
namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /data/asan/vendor
namespace.default.asan.permitted.paths += /vendor namespace.default.asan.permitted.paths += /vendor
namespace.default.links = runtime,system,vndk namespace.default.links = system,vndk
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so
namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES% namespace.default.link.system.shared_libs = %LLNDK_LIBRARIES%
namespace.default.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES% namespace.default.link.vndk.shared_libs = %VNDK_SAMEPROCESS_LIBRARIES%
namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES% namespace.default.link.vndk.shared_libs += %VNDK_CORE_LIBRARIES%
###############################################################################
# "runtime" APEX namespace
#
# This namespace pulls in externally accessible libs from the Runtime APEX.
###############################################################################
namespace.runtime.isolated = true
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = system
# TODO(b/119867084): Restrict to Bionic dlopen dependencies.
namespace.runtime.link.system.allow_all_shared_libs = true
############################################################################### ###############################################################################
# "vndk" namespace # "vndk" namespace
# #
@ -369,9 +347,7 @@ namespace.vndk.asan.search.paths += /system/${LIB}/vndk%VNDK_VER%
# When these NDK libs are required inside this namespace, then it is redirected # When these NDK libs are required inside this namespace, then it is redirected
# to the system namespace. This is possible since their ABI is stable across # to the system namespace. This is possible since their ABI is stable across
# Android releases. # Android releases.
namespace.vndk.links = runtime,system,default namespace.vndk.links = system,default
namespace.vndk.link.runtime.shared_libs = libc.so:libdl.so:libm.so
namespace.vndk.link.system.shared_libs = %LLNDK_LIBRARIES% namespace.vndk.link.system.shared_libs = %LLNDK_LIBRARIES%
namespace.vndk.link.system.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.vndk.link.system.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -397,36 +373,16 @@ namespace.system.asan.search.paths += /%PRODUCT%/${LIB}
namespace.system.asan.search.paths += /data/asan/product_services/${LIB} namespace.system.asan.search.paths += /data/asan/product_services/${LIB}
namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.system.asan.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.system.links = runtime
namespace.system.link.runtime.shared_libs = libc.so:libdl.so:libm.so
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.
# Only default and runtime namespaces are defined and default has no directories # Only default namespace is defined and default has no directories
# other than /system/lib in the search paths. This is because linker calls # other than /system/lib in the search paths. This is because linker calls
# realpath on the search paths and this causes selinux denial if the paths # realpath on the search paths and this causes selinux denial if the paths
# (/vendor, /odm) are not allowed to the postinstall binaries. There is no # (/vendor, /odm) are not allowed to the postinstall binaries. There is no
# reason to allow the binaries to access the paths. # reason to allow the binaries to access the paths.
############################################################################### ###############################################################################
[postinstall] [postinstall]
additional.namespaces = runtime
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.default.links = runtime
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so
###############################################################################
# "runtime" APEX namespace
#
# This namespace pulls in externally accessible libs from the Runtime APEX.
###############################################################################
namespace.runtime.isolated = true
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies.
namespace.runtime.link.default.allow_all_shared_libs = true

51
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -57,8 +57,7 @@ namespace.default.asan.search.paths += /%PRODUCT_SERVICES%/${LIB}
# Keep in sync with ld.config.txt in the com.android.runtime APEX. # Keep in sync with ld.config.txt in the com.android.runtime APEX.
namespace.default.links = runtime namespace.default.links = runtime
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so namespace.default.link.runtime.shared_libs = libart.so:libartd.so
namespace.default.link.runtime.shared_libs += libart.so:libartd.so
namespace.default.link.runtime.shared_libs += libnativehelper.so namespace.default.link.runtime.shared_libs += libnativehelper.so
namespace.default.link.runtime.shared_libs += libnativeloader.so namespace.default.link.runtime.shared_libs += libnativeloader.so
@ -110,12 +109,8 @@ namespace.sphal.asan.permitted.paths += /vendor/${LIB}
# Once in this namespace, access to libraries in /system/lib is restricted. Only # Once in this namespace, access to libraries in /system/lib is restricted. Only
# libs listed here can be used. # libs listed here can be used.
namespace.sphal.links = runtime,default,vndk,rs namespace.sphal.links = default,vndk,rs
namespace.sphal.link.runtime.shared_libs = libc.so:libdl.so:libm.so
# LLNDK_LIBRARIES includes the runtime libs above, but the order here ensures
# that they are loaded from the runtime namespace.
namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES% namespace.sphal.link.default.shared_libs = %LLNDK_LIBRARIES%
namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.sphal.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -162,9 +157,7 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB}
namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB}
namespace.rs.asan.permitted.paths += /data namespace.rs.asan.permitted.paths += /data
namespace.rs.links = runtime,default,vndk namespace.rs.links = default,vndk
namespace.rs.link.runtime.shared_libs = libc.so:libdl.so:libm.so
namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES% namespace.rs.link.default.shared_libs = %LLNDK_LIBRARIES%
namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.rs.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -215,9 +208,7 @@ namespace.vndk.asan.permitted.paths += /system/${LIB}/vndk-sp%VNDK_VER
# When these NDK libs are required inside this namespace, then it is redirected # When these NDK libs are required inside this namespace, then it is redirected
# to the default namespace. This is possible since their ABI is stable across # to the default namespace. This is possible since their ABI is stable across
# Android releases. # Android releases.
namespace.vndk.links = runtime,default namespace.vndk.links = default
namespace.vndk.link.runtime.shared_libs = libc.so:libdl.so:libm.so
namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES% namespace.vndk.link.default.shared_libs = %LLNDK_LIBRARIES%
namespace.vndk.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% namespace.vndk.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
@ -230,7 +221,6 @@ namespace.vndk.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
# (LL-NDK only) access. # (LL-NDK only) access.
############################################################################### ###############################################################################
[vendor] [vendor]
additional.namespaces = runtime
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /odm/${LIB} namespace.default.search.paths = /odm/${LIB}
@ -270,47 +260,16 @@ 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.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.default.links = runtime
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so
###############################################################################
# "runtime" APEX namespace
#
# This namespace pulls in externally accessible libs from the Runtime APEX.
###############################################################################
namespace.runtime.isolated = true
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies.
namespace.runtime.link.default.allow_all_shared_libs = true
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.
# Only default and runtime namespaces are defined and default has no directories # Only default namespace is defined and default has no directories
# other than /system/lib in the search paths. This is because linker calls # other than /system/lib in the search paths. This is because linker calls
# realpath on the search paths and this causes selinux denial if the paths # realpath on the search paths and this causes selinux denial if the paths
# (/vendor, /odm) are not allowed to the postinstall binaries. There is no # (/vendor, /odm) are not allowed to the postinstall binaries. There is no
# reason to allow the binaries to access the paths. # reason to allow the binaries to access the paths.
############################################################################### ###############################################################################
[postinstall] [postinstall]
additional.namespaces = runtime
namespace.default.isolated = false namespace.default.isolated = false
namespace.default.search.paths = /system/${LIB} namespace.default.search.paths = /system/${LIB}
namespace.default.search.paths += /%PRODUCT%/${LIB} namespace.default.search.paths += /%PRODUCT%/${LIB}
namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB} namespace.default.search.paths += /%PRODUCT_SERVICES%/${LIB}
namespace.default.links = runtime
namespace.default.link.runtime.shared_libs = libc.so:libdl.so:libm.so
###############################################################################
# "runtime" APEX namespace
#
# This namespace pulls in externally accessible libs from the Runtime APEX.
###############################################################################
namespace.runtime.isolated = true
namespace.runtime.search.paths = /apex/com.android.runtime/${LIB}
namespace.runtime.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies.
namespace.runtime.link.default.allow_all_shared_libs = true