Remove ld.config.txt from sdkext APEX
Dynamic linker will use generated linker configuration in general. As ld.config.txt file in the APEX module will not be used, we can remove this to avoid confusion. Bug: 149887007 Test: m -j passed Test: Boot succeeded from cuttlefish and walleye Change-Id: I10466863faed3463c69aaec7649f1a5f25b62f17
This commit is contained in:
@@ -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: [
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user