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

Commit 9dff515b authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Exclude libvndksupport from APEXes. 

Test: build, boot, and checked mount paths.
Bug: 123948402
Change-Id: I687dde4f3d1a7971f68c7c536de5002dcdaecfa4
parent c1fd3354

libvndksupport/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ cc_library { 
    local_include_dirs: ["include/vndksupport"],

    export_include_dirs: ["include"],

    shared_libs: ["liblog"],

    version_script: "libvndksupport.map.txt",

    stubs: {

        symbol_file: "libvndksupport.map.txt",

        versions: ["29"],

    },

}



llndk_library {

libvndksupport/libvndksupport.map.txt

+2 −2
Original line number Diff line number Diff line 
LIBVNDKSUPPORT {

  global:

    android_load_sphal_library; # vndk

    android_unload_sphal_library; # vndk

    android_load_sphal_library; # vndk apex

    android_unload_sphal_library; # vndk apex

  local:

    *;

};

rootdir/etc/ld.config.legacy.txt

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################

# Namespace config for binaries under /postinstall.

rootdir/etc/ld.config.txt

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################

# "sphal" namespace

rootdir/etc/ld.config.vndk_lite.txt

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################

# "sphal" namespace