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

Merge "Exclude libvndksupport from APEXes." am: 0b4f2532a7

Browse source 
am: 1fd25add88

Change-Id: I04124c9aa38de67572c26f914fe7f240704c03af
This commit is contained in:
Dongwon Kang 2019-02-12 17:08:35 -08:00 • committed by android-build-merger
commit 6588014f98
5 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libvndksupport/Android.bp
View file

@ -10,6 +10,11 @@ cc_library {
local_include_dirs: ["include/vndksupport"], local_include_dirs: ["include/vndksupport"],
export_include_dirs: ["include"], export_include_dirs: ["include"],
shared_libs: ["liblog"], shared_libs: ["liblog"],
version_script: "libvndksupport.map.txt",
stubs: {
symbol_file: "libvndksupport.map.txt",
versions: ["29"],
},
} }
llndk_library { llndk_library {

4
libvndksupport/libvndksupport.map.txt
View file

@ -1,7 +1,7 @@
LIBVNDKSUPPORT { LIBVNDKSUPPORT {
global: global:
android_load_sphal_library; # vndk android_load_sphal_library; # vndk apex
android_unload_sphal_library; # vndk android_unload_sphal_library; # vndk apex
local: local:
*; *;
}; };

1
rootdir/etc/ld.config.legacy.txt
View file

@ -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 += libm.so
namespace.resolv.link.default.shared_libs += libdl.so namespace.resolv.link.default.shared_libs += libdl.so
namespace.resolv.link.default.shared_libs += libbinder_ndk.so namespace.resolv.link.default.shared_libs += libbinder_ndk.so
namespace.resolv.link.default.shared_libs += libvndksupport.so
############################################################################### ###############################################################################
# Namespace config for binaries under /postinstall. # Namespace config for binaries under /postinstall.

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

@ -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 += libm.so
namespace.resolv.link.default.shared_libs += libdl.so namespace.resolv.link.default.shared_libs += libdl.so
namespace.resolv.link.default.shared_libs += libbinder_ndk.so namespace.resolv.link.default.shared_libs += libbinder_ndk.so
namespace.resolv.link.default.shared_libs += libvndksupport.so
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace

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

@ -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 += libm.so
namespace.resolv.link.default.shared_libs += libdl.so namespace.resolv.link.default.shared_libs += libdl.so
namespace.resolv.link.default.shared_libs += libbinder_ndk.so namespace.resolv.link.default.shared_libs += libbinder_ndk.so
namespace.resolv.link.default.shared_libs += libvndksupport.so
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace