Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5301db4 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Remove ld.config.txt from sdkext APEX"

parents 140049bc 11085bb1

apex/sdkextensions/Android.bp

+0 −8
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ apex_defaults { 
    name: "com.android.sdkext-defaults",

    name: "com.android.sdkext-defaults",

    java_libs: [ "framework-sdkextensions" ],

    java_libs: [ "framework-sdkextensions" ],

    prebuilts: [

    prebuilts: [

        "com.android.sdkext.ldconfig",

        "derive_sdk.rc",

        "derive_sdk.rc",

    ],

    ],

    key: "com.android.sdkext.key",

    key: "com.android.sdkext.key",
@@ -51,13 +50,6 @@ android_app_certificate { 
    certificate: "com.android.sdkext",

    certificate: "com.android.sdkext",

}

}





prebuilt_etc {

    name: "com.android.sdkext.ldconfig",

    src: "ld.config.txt",

    filename: "ld.config.txt",

    installable: false,

}



python_binary_host {

python_binary_host {

    name: "gen_sdkinfo",

    name: "gen_sdkinfo",

    srcs: [

    srcs: [

apex/sdkextensions/ld.config.txt

deleted100644 → 0
+0 −31
Original line number Original line Diff line number Diff line 
# 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