diff options
| -rw-r--r-- | apex/sdkextensions/Android.bp | 8 | ||||
| -rw-r--r-- | apex/sdkextensions/ld.config.txt | 31 |
2 files changed, 0 insertions, 39 deletions
diff --git a/apex/sdkextensions/Android.bp b/apex/sdkextensions/Android.bp index 4c5c2b2cfd4f..25765afb3ab9 100644 --- a/apex/sdkextensions/Android.bp +++ b/apex/sdkextensions/Android.bp @@ -28,7 +28,6 @@ apex_defaults { name: "com.android.sdkext-defaults", java_libs: [ "framework-sdkextensions" ], prebuilts: [ - "com.android.sdkext.ldconfig", "derive_sdk.rc", ], key: "com.android.sdkext.key", @@ -51,13 +50,6 @@ android_app_certificate { certificate: "com.android.sdkext", } -prebuilt_etc { - name: "com.android.sdkext.ldconfig", - src: "ld.config.txt", - filename: "ld.config.txt", - installable: false, -} - python_binary_host { name: "gen_sdkinfo", srcs: [ diff --git a/apex/sdkextensions/ld.config.txt b/apex/sdkextensions/ld.config.txt deleted file mode 100644 index dcc69b892760..000000000000 --- a/apex/sdkextensions/ld.config.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Bionic loader config file for the sdkextensions apex. - -dir.sdkextensions = /apex/com.android.sdkext/bin/ - -[sdkextensions] -additional.namespaces = platform - -namespace.default.isolated = true -namespace.default.links = platform -namespace.default.link.platform.allow_all_shared_libs = true - -############################################################################### -# "platform" namespace: used for NDK libraries -############################################################################### -namespace.platform.isolated = true -namespace.platform.search.paths = /system/${LIB} -namespace.platform.asan.search.paths = /data/asan/system/${LIB} - -# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc. -# Add /apex/... path to the permitted paths because linker uses realpath(3) -# to check the accessibility of the lib. We could add this to search.paths -# instead but that makes the resolution of bionic libs be dependent on -# the order of /system/lib and /apex/... in search.paths. If /apex/... -# is after /system/lib, then /apex/... is never tried because libc.so -# is always found in /system/lib but fails to pass the accessibility test -# because of its realpath. It's better to not depend on the ordering if -# possible. -namespace.platform.permitted.paths = /apex/com.android.runtime/${LIB}/bionic -namespace.platform.asan.permitted.paths = /apex/com.android.runtime/${LIB}/bionic |