diff options
34 files changed, 1078 insertions, 4138 deletions
diff --git a/modules/link.cc b/modules/link.cc index 96b3936..9bf4c10 100644 --- a/modules/link.cc +++ b/modules/link.cc @@ -16,27 +16,12 @@ #include "linkerconfig/link.h" -#include <android-base/strings.h> -#include <set> - #include "linkerconfig/log.h" namespace android { namespace linkerconfig { namespace modules { -namespace { -std::vector<std::string> DedupLibs(const std::vector<std::string>& listOfLibs) { - std::set<std::string> uniq; - for (const auto& libs : listOfLibs) { - for (const auto& lib : base::Split(libs, ":")) { - uniq.insert(lib); - } - } - return {uniq.begin(), uniq.end()}; -} -} // namespace - void Link::AddSharedLib(const std::vector<std::string>& lib_names) { if (!allow_all_shared_libs_) { shared_libs_.insert(shared_libs_.end(), lib_names.begin(), lib_names.end()); @@ -56,7 +41,7 @@ void Link::WriteConfig(ConfigWriter& writer) const { if (allow_all_shared_libs_) { writer.WriteLine(prefix + "allow_all_shared_libs = true"); } else if (!shared_libs_.empty()) { - writer.WriteVars(prefix + "shared_libs", DedupLibs(shared_libs_)); + writer.WriteVars(prefix + "shared_libs", shared_libs_); } else { LOG(WARNING) << "Ignored empty shared libs link from " << origin_namespace_ << " to " << target_namespace_; diff --git a/modules/namespace.cc b/modules/namespace.cc index 520035e..b553c46 100644 --- a/modules/namespace.cc +++ b/modules/namespace.cc @@ -72,9 +72,7 @@ void Namespace::WriteConfig(ConfigWriter& writer) { writer.WriteVars(prefix + "permitted.paths", permitted_paths_); writer.WriteVars(prefix + "asan.search.paths", asan_search_paths_); writer.WriteVars(prefix + "asan.permitted.paths", asan_permitted_paths_); - if (!whitelisted_.empty()) { - writer.WriteLine(prefix + "whitelisted = " + base::Join(whitelisted_, ":")); - } + writer.WriteVars(prefix + "whitelisted", whitelisted_); if (!links_.empty()) { std::vector<std::string> link_list; diff --git a/modules/tests/namespace_test.cc b/modules/tests/namespace_test.cc index 894214a..e6d292c 100644 --- a/modules/tests/namespace_test.cc +++ b/modules/tests/namespace_test.cc @@ -81,7 +81,8 @@ namespace.test_namespace.asan.search.paths += /search_path2 namespace.test_namespace.asan.permitted.paths = /data/asan/permitted_path1 namespace.test_namespace.asan.permitted.paths += /permitted_path1 namespace.test_namespace.asan.permitted.paths += /permitted_path2 -namespace.test_namespace.whitelisted = whitelisted_path1:whitelisted_path2 +namespace.test_namespace.whitelisted = whitelisted_path1 +namespace.test_namespace.whitelisted += whitelisted_path2 )"; TEST(linkerconfig_namespace, simple_namespace) { diff --git a/testdata/golden_output/legacy/com.android.adbd/ld.config.txt b/testdata/golden_output/legacy/com.android.adbd/ld.config.txt index dc520c5..a638d34 100644 --- a/testdata/golden_output/legacy/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.adbd/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libadbd_auth.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -54,18 +50,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -76,21 +68,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -101,19 +89,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/legacy/com.android.art/ld.config.txt b/testdata/golden_output/legacy/com.android.art/ld.config.txt index b933d20..24935e6 100644 --- a/testdata/golden_output/legacy/com.android.art/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.art/ld.config.txt @@ -16,18 +16,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -61,18 +57,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,system namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.system.shared_libs = libc.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.system.shared_libs += libdl.so -namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libc.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -83,18 +75,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -106,21 +94,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -131,19 +115,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt b/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt index 7b4a4fe..56fb1ca 100644 --- a/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.conscrypt/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = com_android_art,system namespace.default.link.com_android_art.shared_libs = libandroidio.so namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -33,18 +29,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -76,18 +68,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -98,21 +86,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -123,19 +107,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt index 0b89809..95828af 100644 --- a/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.media.swcodec/ld.config.txt @@ -12,21 +12,17 @@ namespace.default.links = system namespace.default.link.system.shared_libs = libEGL.so namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so namespace.default.link.system.shared_libs += libnativewindow.so namespace.default.link.system.shared_libs += libsync.so namespace.default.link.system.shared_libs += libvndksupport.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -37,18 +33,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -80,18 +72,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -102,21 +90,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -127,19 +111,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -165,17 +145,10 @@ namespace.sphal.asan.permitted.paths += /data/asan/system/${LIB} namespace.sphal.asan.permitted.paths += /system/${LIB} namespace.sphal.links = system namespace.sphal.link.system.shared_libs = libc.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.system.shared_libs += libdl.so namespace.sphal.link.system.shared_libs += libdl_android.so namespace.sphal.link.system.shared_libs += libm.so +namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} diff --git a/testdata/golden_output/legacy/com.android.runtime/ld.config.txt b/testdata/golden_output/legacy/com.android.runtime/ld.config.txt index 3a40c4c..29c727e 100644 --- a/testdata/golden_output/legacy/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.runtime/ld.config.txt @@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system -namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.default.link.system.shared_libs = liblog.so +namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -32,18 +25,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -75,18 +64,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -97,21 +82,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -122,19 +103,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt b/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt index 97d0fd1..450aa99 100644 --- a/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/legacy/com.android.sdkext/ld.config.txt @@ -10,17 +10,10 @@ namespace.default.asan.permitted.paths = /apex/com.android.sdkext/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -31,18 +24,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -74,18 +63,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -96,21 +81,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -121,19 +102,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/legacy/ld.config.txt b/testdata/golden_output/legacy/ld.config.txt index 041de8f..ab2d93e 100644 --- a/testdata/golden_output/legacy/ld.config.txt +++ b/testdata/golden_output/legacy/ld.config.txt @@ -49,18 +49,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -90,18 +86,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -113,18 +105,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -135,18 +123,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -159,20 +143,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -184,21 +164,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -210,19 +186,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -234,17 +206,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -254,19 +222,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so [postinstall] namespace.default.isolated = false namespace.default.search.paths = /system/${LIB} diff --git a/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt b/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt index dc520c5..a638d34 100644 --- a/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.adbd/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libadbd_auth.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -54,18 +50,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -76,21 +68,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -101,19 +89,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/product-enabled/com.android.art/ld.config.txt b/testdata/golden_output/product-enabled/com.android.art/ld.config.txt index b933d20..24935e6 100644 --- a/testdata/golden_output/product-enabled/com.android.art/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.art/ld.config.txt @@ -16,18 +16,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -61,18 +57,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,system namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.system.shared_libs = libc.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.system.shared_libs += libdl.so -namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libc.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -83,18 +75,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -106,21 +94,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -131,19 +115,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt b/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt index 7b4a4fe..56fb1ca 100644 --- a/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.conscrypt/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = com_android_art,system namespace.default.link.com_android_art.shared_libs = libandroidio.so namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -33,18 +29,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -76,18 +68,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -98,21 +86,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -123,19 +107,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt index 4bba5b1..a44b17f 100644 --- a/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.media.swcodec/ld.config.txt @@ -12,21 +12,17 @@ namespace.default.links = system namespace.default.link.system.shared_libs = libEGL.so namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so namespace.default.link.system.shared_libs += libnativewindow.so namespace.default.link.system.shared_libs += libsync.so namespace.default.link.system.shared_libs += libvndksupport.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -37,18 +33,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -80,18 +72,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -102,21 +90,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -127,19 +111,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -158,62 +138,13 @@ namespace.sphal.asan.permitted.paths += /odm/${LIB} namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = vndk,system -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so -namespace.sphal.link.system.shared_libs = libEGL.so -namespace.sphal.link.system.shared_libs += libGLESv1_CM.so -namespace.sphal.link.system.shared_libs += libGLESv2.so -namespace.sphal.link.system.shared_libs += libGLESv3.so -namespace.sphal.link.system.shared_libs += libRS.so -namespace.sphal.link.system.shared_libs += libandroid_net.so -namespace.sphal.link.system.shared_libs += libbinder_ndk.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.system.shared_libs += libc.so -namespace.sphal.link.system.shared_libs += libcgrouprc.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.system.shared_libs += libdl.so namespace.sphal.link.system.shared_libs += libdl_android.so -namespace.sphal.link.system.shared_libs += liblog.so namespace.sphal.link.system.shared_libs += libm.so -namespace.sphal.link.system.shared_libs += libmediandk.so -namespace.sphal.link.system.shared_libs += libnativewindow.so -namespace.sphal.link.system.shared_libs += libneuralnetworks.so -namespace.sphal.link.system.shared_libs += libsync.so -namespace.sphal.link.system.shared_libs += libvndksupport.so -namespace.sphal.link.system.shared_libs += libvulkan.so +namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} @@ -258,32 +189,11 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = system,sphal,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so diff --git a/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt b/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt index 3a40c4c..29c727e 100644 --- a/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.runtime/ld.config.txt @@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system -namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.default.link.system.shared_libs = liblog.so +namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -32,18 +25,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -75,18 +64,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -97,21 +82,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -122,19 +103,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt b/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt index 97d0fd1..450aa99 100644 --- a/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/product-enabled/com.android.sdkext/ld.config.txt @@ -10,17 +10,10 @@ namespace.default.asan.permitted.paths = /apex/com.android.sdkext/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -31,18 +24,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -74,18 +63,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -96,21 +81,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -121,19 +102,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/product-enabled/ld.config.txt b/testdata/golden_output/product-enabled/ld.config.txt index bd9154a..1e397f5 100644 --- a/testdata/golden_output/product-enabled/ld.config.txt +++ b/testdata/golden_output/product-enabled/ld.config.txt @@ -105,18 +105,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -146,18 +142,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -169,18 +161,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -191,18 +179,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -215,20 +199,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -240,21 +220,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -266,19 +242,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -290,17 +262,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -310,19 +278,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = true namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -349,34 +310,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -396,62 +336,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = true namespace.vndk.visible = true @@ -480,33 +371,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk_product.isolated = true @@ -517,33 +387,12 @@ namespace.vndk_product.asan.search.paths = /data/asan/product/${LIB}/vndk-sp namespace.vndk_product.asan.search.paths += /product/${LIB}/vndk-sp namespace.vndk_product.asan.search.paths += /apex/com.android.vndk.vR/${LIB} namespace.vndk_product.links = default,com_android_neuralnetworks -namespace.vndk_product.link.default.shared_libs = libEGL.so -namespace.vndk_product.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk_product.link.default.shared_libs += libGLESv2.so -namespace.vndk_product.link.default.shared_libs += libGLESv3.so -namespace.vndk_product.link.default.shared_libs += libRS.so -namespace.vndk_product.link.default.shared_libs += libandroid_net.so -namespace.vndk_product.link.default.shared_libs += libbinder_ndk.so +namespace.vndk_product.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk_product.link.default.shared_libs += libc.so -namespace.vndk_product.link.default.shared_libs += libcgrouprc.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk_product.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk_product.link.default.shared_libs += libdl.so namespace.vndk_product.link.default.shared_libs += libdl_android.so -namespace.vndk_product.link.default.shared_libs += liblog.so namespace.vndk_product.link.default.shared_libs += libm.so -namespace.vndk_product.link.default.shared_libs += libmediandk.so -namespace.vndk_product.link.default.shared_libs += libnativewindow.so -namespace.vndk_product.link.default.shared_libs += libneuralnetworks.so -namespace.vndk_product.link.default.shared_libs += libsync.so -namespace.vndk_product.link.default.shared_libs += libvndksupport.so -namespace.vndk_product.link.default.shared_libs += libvulkan.so +namespace.vndk_product.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk_product.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_runtime,system,vndk @@ -563,288 +412,14 @@ namespace.default.asan.permitted.paths += /odm namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /vendor namespace.default.links = system,vndk,com_android_neuralnetworks -namespace.default.link.system.shared_libs = libEGL.so -namespace.default.link.system.shared_libs += libGLESv1_CM.so -namespace.default.link.system.shared_libs += libGLESv2.so -namespace.default.link.system.shared_libs += libGLESv3.so -namespace.default.link.system.shared_libs += libRS.so -namespace.default.link.system.shared_libs += libandroid_net.so -namespace.default.link.system.shared_libs += libbinder_ndk.so +namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so -namespace.default.link.system.shared_libs += libmediandk.so -namespace.default.link.system.shared_libs += libnativewindow.so -namespace.default.link.system.shared_libs += libneuralnetworks.so -namespace.default.link.system.shared_libs += libsync.so -namespace.default.link.system.shared_libs += libvndksupport.so -namespace.default.link.system.shared_libs += libvulkan.so -namespace.default.link.vndk.shared_libs = android.frameworks.cameraservice.common@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.device@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.service@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.displayservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.schedulerservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.sensorservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.atrace@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.authsecret@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.audiocontrol@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.evs@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.vehicle@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.face@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.fingerprint@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.a2dp@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.5.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.5.so -namespace.default.link.vndk.shared_libs += android.hardware.cas.native@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore-utils.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui-support-lib.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.contexthub@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.fastboot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gatekeeper@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.measurement_corrections@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.visibility_control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.3.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health.storage@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.identity-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.input.classifier@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.input.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.ir@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.1.so -namespace.default.link.vndk.shared_libs += android.hardware.light-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.light@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.c2@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.omx@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.memtrack@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.oemlock@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.power.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.deprecated@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.4.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.5.so -namespace.default.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0-core.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.input@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.tuner@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb.gadget@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.vr@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.weaver@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.offload@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.3.so -namespace.default.link.vndk.shared_libs += android.hidl.allocator@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.block@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0-utils.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.1.so -namespace.default.link.vndk.shared_libs += android.system.suspend@1.0.so -namespace.default.link.vndk.shared_libs += android.system.wifi.keystore@1.0.so -namespace.default.link.vndk.shared_libs += libRSCpuRef.so -namespace.default.link.vndk.shared_libs += libRSDriver.so -namespace.default.link.vndk.shared_libs += libRS_internal.so -namespace.default.link.vndk.shared_libs += libadf.so -namespace.default.link.vndk.shared_libs += libaudioroute.so -namespace.default.link.vndk.shared_libs += libaudioutils.so -namespace.default.link.vndk.shared_libs += libbase.so -namespace.default.link.vndk.shared_libs += libbcinfo.so -namespace.default.link.vndk.shared_libs += libbinder.so -namespace.default.link.vndk.shared_libs += libc++.so -namespace.default.link.vndk.shared_libs += libcamera_metadata.so -namespace.default.link.vndk.shared_libs += libcap.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo_minimal-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-x86_64-android.so -namespace.default.link.vndk.shared_libs += libcn-cbor.so -namespace.default.link.vndk.shared_libs += libcodec2.so -namespace.default.link.vndk.shared_libs += libcrypto.so -namespace.default.link.vndk.shared_libs += libcrypto_utils.so -namespace.default.link.vndk.shared_libs += libcurl.so -namespace.default.link.vndk.shared_libs += libcutils.so -namespace.default.link.vndk.shared_libs += libdiskconfig.so -namespace.default.link.vndk.shared_libs += libdumpstateutil.so -namespace.default.link.vndk.shared_libs += libevent.so -namespace.default.link.vndk.shared_libs += libexif.so -namespace.default.link.vndk.shared_libs += libexpat.so -namespace.default.link.vndk.shared_libs += libfmq.so -namespace.default.link.vndk.shared_libs += libgatekeeper.so -namespace.default.link.vndk.shared_libs += libhardware.so -namespace.default.link.vndk.shared_libs += libhardware_legacy.so -namespace.default.link.vndk.shared_libs += libhidlallocatorutils.so -namespace.default.link.vndk.shared_libs += libhidlbase.so -namespace.default.link.vndk.shared_libs += libhidlmemory.so -namespace.default.link.vndk.shared_libs += libion.so -namespace.default.link.vndk.shared_libs += libjpeg.so -namespace.default.link.vndk.shared_libs += libjsoncpp.so -namespace.default.link.vndk.shared_libs += libldacBT_abr.so -namespace.default.link.vndk.shared_libs += libldacBT_enc.so -namespace.default.link.vndk.shared_libs += liblz4.so -namespace.default.link.vndk.shared_libs += liblzma.so -namespace.default.link.vndk.shared_libs += libmedia_helper.so -namespace.default.link.vndk.shared_libs += libmedia_omx.so -namespace.default.link.vndk.shared_libs += libmemtrack.so -namespace.default.link.vndk.shared_libs += libminijail.so -namespace.default.link.vndk.shared_libs += libmkbootimg_abi_check.so -namespace.default.link.vndk.shared_libs += libnetutils.so -namespace.default.link.vndk.shared_libs += libnl.so -namespace.default.link.vndk.shared_libs += libpcre2.so -namespace.default.link.vndk.shared_libs += libpiex.so -namespace.default.link.vndk.shared_libs += libpng.so -namespace.default.link.vndk.shared_libs += libpower.so -namespace.default.link.vndk.shared_libs += libprocessgroup.so -namespace.default.link.vndk.shared_libs += libprocinfo.so -namespace.default.link.vndk.shared_libs += libradio_metadata.so -namespace.default.link.vndk.shared_libs += libselinux.so -namespace.default.link.vndk.shared_libs += libspeexresampler.so -namespace.default.link.vndk.shared_libs += libsqlite.so -namespace.default.link.vndk.shared_libs += libssl.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferqueue_helper.so -namespace.default.link.vndk.shared_libs += libstagefright_foundation.so -namespace.default.link.vndk.shared_libs += libstagefright_omx.so -namespace.default.link.vndk.shared_libs += libstagefright_omx_utils.so -namespace.default.link.vndk.shared_libs += libstagefright_xmlparser.so -namespace.default.link.vndk.shared_libs += libsysutils.so -namespace.default.link.vndk.shared_libs += libtinyalsa.so -namespace.default.link.vndk.shared_libs += libtinyxml2.so -namespace.default.link.vndk.shared_libs += libui.so -namespace.default.link.vndk.shared_libs += libunwindstack.so -namespace.default.link.vndk.shared_libs += libusbhost.so -namespace.default.link.vndk.shared_libs += libutils.so -namespace.default.link.vndk.shared_libs += libutilscallstack.so -namespace.default.link.vndk.shared_libs += libwifi-system-iface.so -namespace.default.link.vndk.shared_libs += libxml2.so -namespace.default.link.vndk.shared_libs += libyuv.so -namespace.default.link.vndk.shared_libs += libz.so -namespace.default.link.vndk.shared_libs += libziparchive.so +namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.common@6.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio.effect@6.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.audio@6.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.bluetooth@1.1.so:android.hardware.boot@1.0.so:android.hardware.boot@1.1.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.cas@1.2.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.dumpstate@1.1.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.health@2.1.so:android.hardware.identity-V1-ndk_platform.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster-V1-ndk_platform.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.keymaster@4.1.so:android.hardware.light-V1-ndk_platform.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.neuralnetworks@1.3.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power-V1-ndk_platform.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.config@1.3.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.radio@1.5.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.secure_element@1.2.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.tv.tuner@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator-V1-ndk_platform.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0-utils.so:android.hidl.token@1.0.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-i686-android.so:libclang_rt.scudo_minimal-i686-android.so:libclang_rt.ubsan_standalone-i686-android.so:libclang_rt.ubsan_standalone-x86_64-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libjpeg.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libradio_metadata.so:libselinux.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} @@ -856,18 +431,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.permitted.paths = /apex/com.android.art/${LIB} @@ -894,18 +465,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -917,21 +484,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -941,19 +504,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = system -namespace.com_android_runtime.link.system.shared_libs = libc.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.system.shared_libs = liblog.so +namespace.com_android_runtime.link.system.shared_libs += libc.so namespace.com_android_runtime.link.system.shared_libs += libdl.so namespace.com_android_runtime.link.system.shared_libs += libdl_android.so -namespace.com_android_runtime.link.system.shared_libs += liblog.so namespace.com_android_runtime.link.system.shared_libs += libm.so +namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /system_ext/${LIB} @@ -986,33 +542,12 @@ namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /apex/com.android.vndk.vR/${LIB} namespace.vndk.links = system,default,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [product] @@ -1026,288 +561,14 @@ namespace.default.asan.search.paths += /product/${LIB} namespace.default.asan.permitted.paths = /data/asan/product namespace.default.asan.permitted.paths += /product namespace.default.links = system,vndk,com_android_neuralnetworks -namespace.default.link.system.shared_libs = libEGL.so -namespace.default.link.system.shared_libs += libGLESv1_CM.so -namespace.default.link.system.shared_libs += libGLESv2.so -namespace.default.link.system.shared_libs += libGLESv3.so -namespace.default.link.system.shared_libs += libRS.so -namespace.default.link.system.shared_libs += libandroid_net.so -namespace.default.link.system.shared_libs += libbinder_ndk.so +namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so -namespace.default.link.system.shared_libs += libmediandk.so -namespace.default.link.system.shared_libs += libnativewindow.so -namespace.default.link.system.shared_libs += libneuralnetworks.so -namespace.default.link.system.shared_libs += libsync.so -namespace.default.link.system.shared_libs += libvndksupport.so -namespace.default.link.system.shared_libs += libvulkan.so -namespace.default.link.vndk.shared_libs = android.frameworks.cameraservice.common@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.device@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.service@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.displayservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.schedulerservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.sensorservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.atrace@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.authsecret@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.audiocontrol@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.evs@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.vehicle@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.face@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.fingerprint@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.a2dp@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.5.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.5.so -namespace.default.link.vndk.shared_libs += android.hardware.cas.native@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore-utils.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui-support-lib.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.contexthub@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.fastboot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gatekeeper@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.measurement_corrections@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.visibility_control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.3.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health.storage@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.identity-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.input.classifier@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.input.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.ir@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.1.so -namespace.default.link.vndk.shared_libs += android.hardware.light-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.light@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.c2@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.omx@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.memtrack@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.oemlock@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.power.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.deprecated@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.4.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.5.so -namespace.default.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0-core.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.input@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.tuner@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb.gadget@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.vr@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.weaver@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.offload@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.3.so -namespace.default.link.vndk.shared_libs += android.hidl.allocator@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.block@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0-utils.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.1.so -namespace.default.link.vndk.shared_libs += android.system.suspend@1.0.so -namespace.default.link.vndk.shared_libs += android.system.wifi.keystore@1.0.so -namespace.default.link.vndk.shared_libs += libRSCpuRef.so -namespace.default.link.vndk.shared_libs += libRSDriver.so -namespace.default.link.vndk.shared_libs += libRS_internal.so -namespace.default.link.vndk.shared_libs += libadf.so -namespace.default.link.vndk.shared_libs += libaudioroute.so -namespace.default.link.vndk.shared_libs += libaudioutils.so -namespace.default.link.vndk.shared_libs += libbase.so -namespace.default.link.vndk.shared_libs += libbcinfo.so -namespace.default.link.vndk.shared_libs += libbinder.so -namespace.default.link.vndk.shared_libs += libc++.so -namespace.default.link.vndk.shared_libs += libcamera_metadata.so -namespace.default.link.vndk.shared_libs += libcap.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo_minimal-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-x86_64-android.so -namespace.default.link.vndk.shared_libs += libcn-cbor.so -namespace.default.link.vndk.shared_libs += libcodec2.so -namespace.default.link.vndk.shared_libs += libcrypto.so -namespace.default.link.vndk.shared_libs += libcrypto_utils.so -namespace.default.link.vndk.shared_libs += libcurl.so -namespace.default.link.vndk.shared_libs += libcutils.so -namespace.default.link.vndk.shared_libs += libdiskconfig.so -namespace.default.link.vndk.shared_libs += libdumpstateutil.so -namespace.default.link.vndk.shared_libs += libevent.so -namespace.default.link.vndk.shared_libs += libexif.so -namespace.default.link.vndk.shared_libs += libexpat.so -namespace.default.link.vndk.shared_libs += libfmq.so -namespace.default.link.vndk.shared_libs += libgatekeeper.so -namespace.default.link.vndk.shared_libs += libhardware.so -namespace.default.link.vndk.shared_libs += libhardware_legacy.so -namespace.default.link.vndk.shared_libs += libhidlallocatorutils.so -namespace.default.link.vndk.shared_libs += libhidlbase.so -namespace.default.link.vndk.shared_libs += libhidlmemory.so -namespace.default.link.vndk.shared_libs += libion.so -namespace.default.link.vndk.shared_libs += libjpeg.so -namespace.default.link.vndk.shared_libs += libjsoncpp.so -namespace.default.link.vndk.shared_libs += libldacBT_abr.so -namespace.default.link.vndk.shared_libs += libldacBT_enc.so -namespace.default.link.vndk.shared_libs += liblz4.so -namespace.default.link.vndk.shared_libs += liblzma.so -namespace.default.link.vndk.shared_libs += libmedia_helper.so -namespace.default.link.vndk.shared_libs += libmedia_omx.so -namespace.default.link.vndk.shared_libs += libmemtrack.so -namespace.default.link.vndk.shared_libs += libminijail.so -namespace.default.link.vndk.shared_libs += libmkbootimg_abi_check.so -namespace.default.link.vndk.shared_libs += libnetutils.so -namespace.default.link.vndk.shared_libs += libnl.so -namespace.default.link.vndk.shared_libs += libpcre2.so -namespace.default.link.vndk.shared_libs += libpiex.so -namespace.default.link.vndk.shared_libs += libpng.so -namespace.default.link.vndk.shared_libs += libpower.so -namespace.default.link.vndk.shared_libs += libprocessgroup.so -namespace.default.link.vndk.shared_libs += libprocinfo.so -namespace.default.link.vndk.shared_libs += libradio_metadata.so -namespace.default.link.vndk.shared_libs += libselinux.so -namespace.default.link.vndk.shared_libs += libspeexresampler.so -namespace.default.link.vndk.shared_libs += libsqlite.so -namespace.default.link.vndk.shared_libs += libssl.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferqueue_helper.so -namespace.default.link.vndk.shared_libs += libstagefright_foundation.so -namespace.default.link.vndk.shared_libs += libstagefright_omx.so -namespace.default.link.vndk.shared_libs += libstagefright_omx_utils.so -namespace.default.link.vndk.shared_libs += libstagefright_xmlparser.so -namespace.default.link.vndk.shared_libs += libsysutils.so -namespace.default.link.vndk.shared_libs += libtinyalsa.so -namespace.default.link.vndk.shared_libs += libtinyxml2.so -namespace.default.link.vndk.shared_libs += libui.so -namespace.default.link.vndk.shared_libs += libunwindstack.so -namespace.default.link.vndk.shared_libs += libusbhost.so -namespace.default.link.vndk.shared_libs += libutils.so -namespace.default.link.vndk.shared_libs += libutilscallstack.so -namespace.default.link.vndk.shared_libs += libwifi-system-iface.so -namespace.default.link.vndk.shared_libs += libxml2.so -namespace.default.link.vndk.shared_libs += libyuv.so -namespace.default.link.vndk.shared_libs += libz.so -namespace.default.link.vndk.shared_libs += libziparchive.so +namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.common@6.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio.effect@6.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.audio@6.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.bluetooth@1.1.so:android.hardware.boot@1.0.so:android.hardware.boot@1.1.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.cas@1.2.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.dumpstate@1.1.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.health@2.1.so:android.hardware.identity-V1-ndk_platform.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster-V1-ndk_platform.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.keymaster@4.1.so:android.hardware.light-V1-ndk_platform.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.neuralnetworks@1.3.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power-V1-ndk_platform.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.config@1.3.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.radio@1.5.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.secure_element@1.2.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.tv.tuner@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator-V1-ndk_platform.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0-utils.so:android.hidl.token@1.0.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-i686-android.so:libclang_rt.scudo_minimal-i686-android.so:libclang_rt.ubsan_standalone-i686-android.so:libclang_rt.ubsan_standalone-x86_64-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libjpeg.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libradio_metadata.so:libselinux.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} @@ -1319,18 +580,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -1358,18 +615,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -1381,21 +634,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -1405,19 +654,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = system -namespace.com_android_runtime.link.system.shared_libs = libc.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.system.shared_libs = liblog.so +namespace.com_android_runtime.link.system.shared_libs += libc.so namespace.com_android_runtime.link.system.shared_libs += libdl.so namespace.com_android_runtime.link.system.shared_libs += libdl_android.so -namespace.com_android_runtime.link.system.shared_libs += liblog.so namespace.com_android_runtime.link.system.shared_libs += libm.so +namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /system_ext/${LIB} @@ -1444,33 +686,12 @@ namespace.vndk.asan.search.paths += /data/asan/product/${LIB}/vndk namespace.vndk.asan.search.paths += /product/${LIB}/vndk namespace.vndk.asan.search.paths += /apex/com.android.vndk.vR/${LIB} namespace.vndk.links = system,default,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [unrestricted] @@ -1510,18 +731,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -1551,18 +768,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -1574,18 +787,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -1596,18 +805,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -1620,20 +825,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -1645,21 +846,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -1671,19 +868,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -1695,17 +888,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -1715,19 +904,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = false namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -1754,34 +936,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = false namespace.sphal.visible = true @@ -1801,62 +962,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = false namespace.vndk.visible = true @@ -1885,33 +997,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [postinstall] diff --git a/testdata/golden_output/stage1/com.android.art/ld.config.txt b/testdata/golden_output/stage1/com.android.art/ld.config.txt index d0dbfa5..b601d72 100644 --- a/testdata/golden_output/stage1/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage1/com.android.art/ld.config.txt @@ -35,18 +35,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} diff --git a/testdata/golden_output/stage1/com.android.runtime/ld.config.txt b/testdata/golden_output/stage1/com.android.runtime/ld.config.txt index bf690a3..e72277b 100644 --- a/testdata/golden_output/stage1/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage1/com.android.runtime/ld.config.txt @@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system -namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.default.link.system.shared_libs = liblog.so +namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -51,18 +44,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} diff --git a/testdata/golden_output/stage1/ld.config.txt b/testdata/golden_output/stage1/ld.config.txt index e6cdc59..28fb683 100644 --- a/testdata/golden_output/stage1/ld.config.txt +++ b/testdata/golden_output/stage1/ld.config.txt @@ -122,18 +122,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -143,19 +139,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = true namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -182,34 +171,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.isolated = true namespace.sphal.visible = true namespace.sphal.search.paths = /odm/${LIB} @@ -228,62 +196,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.vndk.isolated = true namespace.vndk.visible = true namespace.vndk.search.paths = /odm/${LIB}/vndk-sp @@ -311,33 +230,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true [vendor] additional.namespaces = com_android_art,com_android_i18n,com_android_runtime,system,vndk @@ -357,288 +255,14 @@ namespace.default.asan.permitted.paths += /odm namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /vendor namespace.default.links = system,vndk -namespace.default.link.system.shared_libs = libEGL.so -namespace.default.link.system.shared_libs += libGLESv1_CM.so -namespace.default.link.system.shared_libs += libGLESv2.so -namespace.default.link.system.shared_libs += libGLESv3.so -namespace.default.link.system.shared_libs += libRS.so -namespace.default.link.system.shared_libs += libandroid_net.so -namespace.default.link.system.shared_libs += libbinder_ndk.so +namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so -namespace.default.link.system.shared_libs += libmediandk.so -namespace.default.link.system.shared_libs += libnativewindow.so -namespace.default.link.system.shared_libs += libneuralnetworks.so -namespace.default.link.system.shared_libs += libsync.so -namespace.default.link.system.shared_libs += libvndksupport.so -namespace.default.link.system.shared_libs += libvulkan.so -namespace.default.link.vndk.shared_libs = android.frameworks.cameraservice.common@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.device@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.service@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.displayservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.schedulerservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.sensorservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.atrace@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.authsecret@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.audiocontrol@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.evs@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.vehicle@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.face@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.fingerprint@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.a2dp@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.5.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.5.so -namespace.default.link.vndk.shared_libs += android.hardware.cas.native@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore-utils.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui-support-lib.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.contexthub@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.fastboot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gatekeeper@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.measurement_corrections@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.visibility_control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.3.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health.storage@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.identity-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.input.classifier@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.input.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.ir@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.1.so -namespace.default.link.vndk.shared_libs += android.hardware.light-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.light@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.c2@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.omx@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.memtrack@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.oemlock@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.power.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.deprecated@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.4.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.5.so -namespace.default.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0-core.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.input@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.tuner@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb.gadget@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.vr@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.weaver@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.offload@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.3.so -namespace.default.link.vndk.shared_libs += android.hidl.allocator@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.block@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0-utils.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.1.so -namespace.default.link.vndk.shared_libs += android.system.suspend@1.0.so -namespace.default.link.vndk.shared_libs += android.system.wifi.keystore@1.0.so -namespace.default.link.vndk.shared_libs += libRSCpuRef.so -namespace.default.link.vndk.shared_libs += libRSDriver.so -namespace.default.link.vndk.shared_libs += libRS_internal.so -namespace.default.link.vndk.shared_libs += libadf.so -namespace.default.link.vndk.shared_libs += libaudioroute.so -namespace.default.link.vndk.shared_libs += libaudioutils.so -namespace.default.link.vndk.shared_libs += libbase.so -namespace.default.link.vndk.shared_libs += libbcinfo.so -namespace.default.link.vndk.shared_libs += libbinder.so -namespace.default.link.vndk.shared_libs += libc++.so -namespace.default.link.vndk.shared_libs += libcamera_metadata.so -namespace.default.link.vndk.shared_libs += libcap.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo_minimal-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-x86_64-android.so -namespace.default.link.vndk.shared_libs += libcn-cbor.so -namespace.default.link.vndk.shared_libs += libcodec2.so -namespace.default.link.vndk.shared_libs += libcrypto.so -namespace.default.link.vndk.shared_libs += libcrypto_utils.so -namespace.default.link.vndk.shared_libs += libcurl.so -namespace.default.link.vndk.shared_libs += libcutils.so -namespace.default.link.vndk.shared_libs += libdiskconfig.so -namespace.default.link.vndk.shared_libs += libdumpstateutil.so -namespace.default.link.vndk.shared_libs += libevent.so -namespace.default.link.vndk.shared_libs += libexif.so -namespace.default.link.vndk.shared_libs += libexpat.so -namespace.default.link.vndk.shared_libs += libfmq.so -namespace.default.link.vndk.shared_libs += libgatekeeper.so -namespace.default.link.vndk.shared_libs += libhardware.so -namespace.default.link.vndk.shared_libs += libhardware_legacy.so -namespace.default.link.vndk.shared_libs += libhidlallocatorutils.so -namespace.default.link.vndk.shared_libs += libhidlbase.so -namespace.default.link.vndk.shared_libs += libhidlmemory.so -namespace.default.link.vndk.shared_libs += libion.so -namespace.default.link.vndk.shared_libs += libjpeg.so -namespace.default.link.vndk.shared_libs += libjsoncpp.so -namespace.default.link.vndk.shared_libs += libldacBT_abr.so -namespace.default.link.vndk.shared_libs += libldacBT_enc.so -namespace.default.link.vndk.shared_libs += liblz4.so -namespace.default.link.vndk.shared_libs += liblzma.so -namespace.default.link.vndk.shared_libs += libmedia_helper.so -namespace.default.link.vndk.shared_libs += libmedia_omx.so -namespace.default.link.vndk.shared_libs += libmemtrack.so -namespace.default.link.vndk.shared_libs += libminijail.so -namespace.default.link.vndk.shared_libs += libmkbootimg_abi_check.so -namespace.default.link.vndk.shared_libs += libnetutils.so -namespace.default.link.vndk.shared_libs += libnl.so -namespace.default.link.vndk.shared_libs += libpcre2.so -namespace.default.link.vndk.shared_libs += libpiex.so -namespace.default.link.vndk.shared_libs += libpng.so -namespace.default.link.vndk.shared_libs += libpower.so -namespace.default.link.vndk.shared_libs += libprocessgroup.so -namespace.default.link.vndk.shared_libs += libprocinfo.so -namespace.default.link.vndk.shared_libs += libradio_metadata.so -namespace.default.link.vndk.shared_libs += libselinux.so -namespace.default.link.vndk.shared_libs += libspeexresampler.so -namespace.default.link.vndk.shared_libs += libsqlite.so -namespace.default.link.vndk.shared_libs += libssl.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferqueue_helper.so -namespace.default.link.vndk.shared_libs += libstagefright_foundation.so -namespace.default.link.vndk.shared_libs += libstagefright_omx.so -namespace.default.link.vndk.shared_libs += libstagefright_omx_utils.so -namespace.default.link.vndk.shared_libs += libstagefright_xmlparser.so -namespace.default.link.vndk.shared_libs += libsysutils.so -namespace.default.link.vndk.shared_libs += libtinyalsa.so -namespace.default.link.vndk.shared_libs += libtinyxml2.so -namespace.default.link.vndk.shared_libs += libui.so -namespace.default.link.vndk.shared_libs += libunwindstack.so -namespace.default.link.vndk.shared_libs += libusbhost.so -namespace.default.link.vndk.shared_libs += libutils.so -namespace.default.link.vndk.shared_libs += libutilscallstack.so -namespace.default.link.vndk.shared_libs += libwifi-system-iface.so -namespace.default.link.vndk.shared_libs += libxml2.so -namespace.default.link.vndk.shared_libs += libyuv.so -namespace.default.link.vndk.shared_libs += libz.so -namespace.default.link.vndk.shared_libs += libziparchive.so +namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.common@6.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio.effect@6.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.audio@6.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.bluetooth@1.1.so:android.hardware.boot@1.0.so:android.hardware.boot@1.1.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.cas@1.2.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.dumpstate@1.1.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.health@2.1.so:android.hardware.identity-V1-ndk_platform.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster-V1-ndk_platform.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.keymaster@4.1.so:android.hardware.light-V1-ndk_platform.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.neuralnetworks@1.3.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power-V1-ndk_platform.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.config@1.3.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.radio@1.5.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.secure_element@1.2.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.tv.tuner@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator-V1-ndk_platform.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0-utils.so:android.hidl.token@1.0.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-i686-android.so:libclang_rt.scudo_minimal-i686-android.so:libclang_rt.ubsan_standalone-i686-android.so:libclang_rt.ubsan_standalone-x86_64-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libjpeg.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libradio_metadata.so:libselinux.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so namespace.com_android_art.isolated = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.permitted.paths = /apex/com.android.art/${LIB} @@ -663,18 +287,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -684,19 +304,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = system -namespace.com_android_runtime.link.system.shared_libs = libc.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.system.shared_libs = liblog.so +namespace.com_android_runtime.link.system.shared_libs += libc.so namespace.com_android_runtime.link.system.shared_libs += libdl.so namespace.com_android_runtime.link.system.shared_libs += libdl_android.so -namespace.com_android_runtime.link.system.shared_libs += liblog.so namespace.com_android_runtime.link.system.shared_libs += libm.so +namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /system_ext/${LIB} @@ -732,33 +345,12 @@ namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /apex/com.android.vndk.vR/${LIB} namespace.vndk.links = system,default -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.allow_all_shared_libs = true [unrestricted] additional.namespaces = com_android_art,com_android_i18n,com_android_runtime,rs,sphal,vndk @@ -809,18 +401,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -830,19 +418,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = false namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -869,34 +450,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.isolated = false namespace.sphal.visible = true namespace.sphal.search.paths = /odm/${LIB} @@ -915,62 +475,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.vndk.isolated = false namespace.vndk.visible = true namespace.vndk.search.paths = /odm/${LIB}/vndk-sp @@ -998,33 +509,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true [postinstall] namespace.default.isolated = false diff --git a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt index dc520c5..a638d34 100644 --- a/testdata/golden_output/stage2/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.adbd/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libadbd_auth.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -54,18 +50,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -76,21 +68,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -101,19 +89,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/stage2/com.android.art/ld.config.txt b/testdata/golden_output/stage2/com.android.art/ld.config.txt index b933d20..24935e6 100644 --- a/testdata/golden_output/stage2/com.android.art/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.art/ld.config.txt @@ -16,18 +16,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -61,18 +57,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,system namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.system.shared_libs = libc.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.system.shared_libs += libdl.so -namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libc.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -83,18 +75,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -106,21 +94,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -131,19 +115,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt index 7b4a4fe..56fb1ca 100644 --- a/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.conscrypt/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = com_android_art,system namespace.default.link.com_android_art.shared_libs = libandroidio.so namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -33,18 +29,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -76,18 +68,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -98,21 +86,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -123,19 +107,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt index 4bba5b1..a44b17f 100644 --- a/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.media.swcodec/ld.config.txt @@ -12,21 +12,17 @@ namespace.default.links = system namespace.default.link.system.shared_libs = libEGL.so namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so namespace.default.link.system.shared_libs += libnativewindow.so namespace.default.link.system.shared_libs += libsync.so namespace.default.link.system.shared_libs += libvndksupport.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -37,18 +33,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -80,18 +72,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -102,21 +90,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -127,19 +111,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -158,62 +138,13 @@ namespace.sphal.asan.permitted.paths += /odm/${LIB} namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = vndk,system -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so -namespace.sphal.link.system.shared_libs = libEGL.so -namespace.sphal.link.system.shared_libs += libGLESv1_CM.so -namespace.sphal.link.system.shared_libs += libGLESv2.so -namespace.sphal.link.system.shared_libs += libGLESv3.so -namespace.sphal.link.system.shared_libs += libRS.so -namespace.sphal.link.system.shared_libs += libandroid_net.so -namespace.sphal.link.system.shared_libs += libbinder_ndk.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.system.shared_libs += libc.so -namespace.sphal.link.system.shared_libs += libcgrouprc.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.system.shared_libs += libdl.so namespace.sphal.link.system.shared_libs += libdl_android.so -namespace.sphal.link.system.shared_libs += liblog.so namespace.sphal.link.system.shared_libs += libm.so -namespace.sphal.link.system.shared_libs += libmediandk.so -namespace.sphal.link.system.shared_libs += libnativewindow.so -namespace.sphal.link.system.shared_libs += libneuralnetworks.so -namespace.sphal.link.system.shared_libs += libsync.so -namespace.sphal.link.system.shared_libs += libvndksupport.so -namespace.sphal.link.system.shared_libs += libvulkan.so +namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} @@ -258,32 +189,11 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = system,sphal,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so diff --git a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt index 3a40c4c..29c727e 100644 --- a/testdata/golden_output/stage2/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.runtime/ld.config.txt @@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system -namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.default.link.system.shared_libs = liblog.so +namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -32,18 +25,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -75,18 +64,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -97,21 +82,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -122,19 +103,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt index 97d0fd1..450aa99 100644 --- a/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/stage2/com.android.sdkext/ld.config.txt @@ -10,17 +10,10 @@ namespace.default.asan.permitted.paths = /apex/com.android.sdkext/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -31,18 +24,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -74,18 +63,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -96,21 +81,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -121,19 +102,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/stage2/ld.config.txt b/testdata/golden_output/stage2/ld.config.txt index a70ae57..5a43130 100644 --- a/testdata/golden_output/stage2/ld.config.txt +++ b/testdata/golden_output/stage2/ld.config.txt @@ -110,18 +110,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -151,18 +147,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -174,18 +166,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -196,18 +184,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -220,20 +204,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -245,21 +225,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -271,19 +247,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -295,17 +267,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -315,19 +283,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = true namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -354,34 +315,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -401,62 +341,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = true namespace.vndk.visible = true @@ -485,33 +376,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] @@ -532,288 +402,14 @@ namespace.default.asan.permitted.paths += /odm namespace.default.asan.permitted.paths += /data/asan/vendor namespace.default.asan.permitted.paths += /vendor namespace.default.links = system,vndk,com_android_neuralnetworks -namespace.default.link.system.shared_libs = libEGL.so -namespace.default.link.system.shared_libs += libGLESv1_CM.so -namespace.default.link.system.shared_libs += libGLESv2.so -namespace.default.link.system.shared_libs += libGLESv3.so -namespace.default.link.system.shared_libs += libRS.so -namespace.default.link.system.shared_libs += libandroid_net.so -namespace.default.link.system.shared_libs += libbinder_ndk.so +namespace.default.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so -namespace.default.link.system.shared_libs += libmediandk.so -namespace.default.link.system.shared_libs += libnativewindow.so -namespace.default.link.system.shared_libs += libneuralnetworks.so -namespace.default.link.system.shared_libs += libsync.so -namespace.default.link.system.shared_libs += libvndksupport.so -namespace.default.link.system.shared_libs += libvulkan.so -namespace.default.link.vndk.shared_libs = android.frameworks.cameraservice.common@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.device@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.service@2.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.displayservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.schedulerservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.sensorservice@1.0.so -namespace.default.link.vndk.shared_libs += android.frameworks.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.atrace@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.common@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio.effect@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@5.0.so -namespace.default.link.vndk.shared_libs += android.hardware.audio@6.0.so -namespace.default.link.vndk.shared_libs += android.hardware.authsecret@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.audiocontrol@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.evs@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.automotive.vehicle@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.face@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.biometrics.fingerprint@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.a2dp@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth.audio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.bluetooth@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.boot@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.broadcastradio@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.device@3.5.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.2.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.3.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.metadata@3.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.4.so -namespace.default.link.vndk.shared_libs += android.hardware.camera.provider@2.5.so -namespace.default.link.vndk.shared_libs += android.hardware.cas.native@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.cas@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore-utils.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.configstore@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui-support-lib.so -namespace.default.link.vndk.shared_libs += android.hardware.confirmationui@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.contexthub@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.drm@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.dumpstate@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.fastboot@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gatekeeper@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.measurement_corrections@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss.visibility_control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.gnss@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.allocator@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.bufferqueue@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.composer@2.3.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health.storage@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.health@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.identity-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.input.classifier@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.input.common@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.ir@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@3.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.0.so -namespace.default.link.vndk.shared_libs += android.hardware.keymaster@4.1.so -namespace.default.link.vndk.shared_libs += android.hardware.light-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.light@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.c2@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media.omx@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.media@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.memtrack@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.neuralnetworks@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.nfc@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.oemlock@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.power.stats@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.power@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.config@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio.deprecated@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.4.so -namespace.default.link.vndk.shared_libs += android.hardware.radio@1.5.so -namespace.default.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.secure_element@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.sensors@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0-core.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.1.so -namespace.default.link.vndk.shared_libs += android.hardware.soundtrigger@2.2.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.config@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tetheroffload.control@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.thermal@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.cec@2.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.input@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.tv.tuner@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb.gadget@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.usb@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator-V1-ndk_platform.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.vibrator@1.3.so -namespace.default.link.vndk.shared_libs += android.hardware.vr@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.weaver@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.hostapd@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.offload@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi.supplicant@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.0.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.1.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.2.so -namespace.default.link.vndk.shared_libs += android.hardware.wifi@1.3.so -namespace.default.link.vndk.shared_libs += android.hidl.allocator@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.block@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.default.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0-utils.so -namespace.default.link.vndk.shared_libs += android.hidl.token@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.0.so -namespace.default.link.vndk.shared_libs += android.system.net.netd@1.1.so -namespace.default.link.vndk.shared_libs += android.system.suspend@1.0.so -namespace.default.link.vndk.shared_libs += android.system.wifi.keystore@1.0.so -namespace.default.link.vndk.shared_libs += libRSCpuRef.so -namespace.default.link.vndk.shared_libs += libRSDriver.so -namespace.default.link.vndk.shared_libs += libRS_internal.so -namespace.default.link.vndk.shared_libs += libadf.so -namespace.default.link.vndk.shared_libs += libaudioroute.so -namespace.default.link.vndk.shared_libs += libaudioutils.so -namespace.default.link.vndk.shared_libs += libbase.so -namespace.default.link.vndk.shared_libs += libbcinfo.so -namespace.default.link.vndk.shared_libs += libbinder.so -namespace.default.link.vndk.shared_libs += libc++.so -namespace.default.link.vndk.shared_libs += libcamera_metadata.so -namespace.default.link.vndk.shared_libs += libcap.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.scudo_minimal-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-i686-android.so -namespace.default.link.vndk.shared_libs += libclang_rt.ubsan_standalone-x86_64-android.so -namespace.default.link.vndk.shared_libs += libcn-cbor.so -namespace.default.link.vndk.shared_libs += libcodec2.so -namespace.default.link.vndk.shared_libs += libcrypto.so -namespace.default.link.vndk.shared_libs += libcrypto_utils.so -namespace.default.link.vndk.shared_libs += libcurl.so -namespace.default.link.vndk.shared_libs += libcutils.so -namespace.default.link.vndk.shared_libs += libdiskconfig.so -namespace.default.link.vndk.shared_libs += libdumpstateutil.so -namespace.default.link.vndk.shared_libs += libevent.so -namespace.default.link.vndk.shared_libs += libexif.so -namespace.default.link.vndk.shared_libs += libexpat.so -namespace.default.link.vndk.shared_libs += libfmq.so -namespace.default.link.vndk.shared_libs += libgatekeeper.so -namespace.default.link.vndk.shared_libs += libhardware.so -namespace.default.link.vndk.shared_libs += libhardware_legacy.so -namespace.default.link.vndk.shared_libs += libhidlallocatorutils.so -namespace.default.link.vndk.shared_libs += libhidlbase.so -namespace.default.link.vndk.shared_libs += libhidlmemory.so -namespace.default.link.vndk.shared_libs += libion.so -namespace.default.link.vndk.shared_libs += libjpeg.so -namespace.default.link.vndk.shared_libs += libjsoncpp.so -namespace.default.link.vndk.shared_libs += libldacBT_abr.so -namespace.default.link.vndk.shared_libs += libldacBT_enc.so -namespace.default.link.vndk.shared_libs += liblz4.so -namespace.default.link.vndk.shared_libs += liblzma.so -namespace.default.link.vndk.shared_libs += libmedia_helper.so -namespace.default.link.vndk.shared_libs += libmedia_omx.so -namespace.default.link.vndk.shared_libs += libmemtrack.so -namespace.default.link.vndk.shared_libs += libminijail.so -namespace.default.link.vndk.shared_libs += libmkbootimg_abi_check.so -namespace.default.link.vndk.shared_libs += libnetutils.so -namespace.default.link.vndk.shared_libs += libnl.so -namespace.default.link.vndk.shared_libs += libpcre2.so -namespace.default.link.vndk.shared_libs += libpiex.so -namespace.default.link.vndk.shared_libs += libpng.so -namespace.default.link.vndk.shared_libs += libpower.so -namespace.default.link.vndk.shared_libs += libprocessgroup.so -namespace.default.link.vndk.shared_libs += libprocinfo.so -namespace.default.link.vndk.shared_libs += libradio_metadata.so -namespace.default.link.vndk.shared_libs += libselinux.so -namespace.default.link.vndk.shared_libs += libspeexresampler.so -namespace.default.link.vndk.shared_libs += libsqlite.so -namespace.default.link.vndk.shared_libs += libssl.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferpool@2.0.so -namespace.default.link.vndk.shared_libs += libstagefright_bufferqueue_helper.so -namespace.default.link.vndk.shared_libs += libstagefright_foundation.so -namespace.default.link.vndk.shared_libs += libstagefright_omx.so -namespace.default.link.vndk.shared_libs += libstagefright_omx_utils.so -namespace.default.link.vndk.shared_libs += libstagefright_xmlparser.so -namespace.default.link.vndk.shared_libs += libsysutils.so -namespace.default.link.vndk.shared_libs += libtinyalsa.so -namespace.default.link.vndk.shared_libs += libtinyxml2.so -namespace.default.link.vndk.shared_libs += libui.so -namespace.default.link.vndk.shared_libs += libunwindstack.so -namespace.default.link.vndk.shared_libs += libusbhost.so -namespace.default.link.vndk.shared_libs += libutils.so -namespace.default.link.vndk.shared_libs += libutilscallstack.so -namespace.default.link.vndk.shared_libs += libwifi-system-iface.so -namespace.default.link.vndk.shared_libs += libxml2.so -namespace.default.link.vndk.shared_libs += libyuv.so -namespace.default.link.vndk.shared_libs += libz.so -namespace.default.link.vndk.shared_libs += libziparchive.so +namespace.default.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so +namespace.default.link.vndk.shared_libs += android.frameworks.cameraservice.common@2.0.so:android.frameworks.cameraservice.device@2.0.so:android.frameworks.cameraservice.service@2.0.so:android.frameworks.displayservice@1.0.so:android.frameworks.schedulerservice@1.0.so:android.frameworks.sensorservice@1.0.so:android.frameworks.stats@1.0.so:android.hardware.atrace@1.0.so:android.hardware.audio.common@2.0.so:android.hardware.audio.common@4.0.so:android.hardware.audio.common@5.0.so:android.hardware.audio.common@6.0.so:android.hardware.audio.effect@2.0.so:android.hardware.audio.effect@4.0.so:android.hardware.audio.effect@5.0.so:android.hardware.audio.effect@6.0.so:android.hardware.audio@2.0.so:android.hardware.audio@4.0.so:android.hardware.audio@5.0.so:android.hardware.audio@6.0.so:android.hardware.authsecret@1.0.so:android.hardware.automotive.audiocontrol@1.0.so:android.hardware.automotive.evs@1.0.so:android.hardware.automotive.vehicle@2.0.so:android.hardware.biometrics.face@1.0.so:android.hardware.biometrics.fingerprint@2.1.so:android.hardware.bluetooth.a2dp@1.0.so:android.hardware.bluetooth.audio@2.0.so:android.hardware.bluetooth@1.0.so:android.hardware.bluetooth@1.1.so:android.hardware.boot@1.0.so:android.hardware.boot@1.1.so:android.hardware.broadcastradio@1.0.so:android.hardware.broadcastradio@1.1.so:android.hardware.broadcastradio@2.0.so:android.hardware.camera.common@1.0.so:android.hardware.camera.device@1.0.so:android.hardware.camera.device@3.2.so:android.hardware.camera.device@3.3.so:android.hardware.camera.device@3.4.so:android.hardware.camera.device@3.5.so:android.hardware.camera.metadata@3.2.so:android.hardware.camera.metadata@3.3.so:android.hardware.camera.metadata@3.4.so:android.hardware.camera.provider@2.4.so:android.hardware.camera.provider@2.5.so:android.hardware.cas.native@1.0.so:android.hardware.cas@1.0.so:android.hardware.cas@1.1.so:android.hardware.cas@1.2.so:android.hardware.configstore-utils.so:android.hardware.configstore@1.0.so:android.hardware.configstore@1.1.so:android.hardware.confirmationui-support-lib.so:android.hardware.confirmationui@1.0.so:android.hardware.contexthub@1.0.so:android.hardware.drm@1.0.so:android.hardware.drm@1.1.so:android.hardware.drm@1.2.so:android.hardware.dumpstate@1.0.so:android.hardware.dumpstate@1.1.so:android.hardware.fastboot@1.0.so:android.hardware.gatekeeper@1.0.so:android.hardware.gnss.measurement_corrections@1.0.so:android.hardware.gnss.visibility_control@1.0.so:android.hardware.gnss@1.0.so:android.hardware.gnss@1.1.so:android.hardware.gnss@2.0.so:android.hardware.graphics.allocator@2.0.so:android.hardware.graphics.allocator@3.0.so:android.hardware.graphics.bufferqueue@1.0.so:android.hardware.graphics.bufferqueue@2.0.so:android.hardware.graphics.composer@2.1.so:android.hardware.graphics.composer@2.2.so:android.hardware.graphics.composer@2.3.so:android.hardware.health.storage@1.0.so:android.hardware.health@1.0.so:android.hardware.health@2.0.so:android.hardware.health@2.1.so:android.hardware.identity-V1-ndk_platform.so:android.hardware.input.classifier@1.0.so:android.hardware.input.common@1.0.so:android.hardware.ir@1.0.so:android.hardware.keymaster-V1-ndk_platform.so:android.hardware.keymaster@3.0.so:android.hardware.keymaster@4.0.so:android.hardware.keymaster@4.1.so:android.hardware.light-V1-ndk_platform.so:android.hardware.light@2.0.so:android.hardware.media.bufferpool@1.0.so:android.hardware.media.bufferpool@2.0.so:android.hardware.media.c2@1.0.so:android.hardware.media.omx@1.0.so:android.hardware.media@1.0.so:android.hardware.memtrack@1.0.so:android.hardware.neuralnetworks@1.0.so:android.hardware.neuralnetworks@1.1.so:android.hardware.neuralnetworks@1.2.so:android.hardware.neuralnetworks@1.3.so:android.hardware.nfc@1.0.so:android.hardware.nfc@1.1.so:android.hardware.nfc@1.2.so:android.hardware.oemlock@1.0.so:android.hardware.power-V1-ndk_platform.so:android.hardware.power.stats@1.0.so:android.hardware.power@1.0.so:android.hardware.power@1.1.so:android.hardware.power@1.2.so:android.hardware.power@1.3.so:android.hardware.radio.config@1.0.so:android.hardware.radio.config@1.1.so:android.hardware.radio.config@1.2.so:android.hardware.radio.config@1.3.so:android.hardware.radio.deprecated@1.0.so:android.hardware.radio@1.0.so:android.hardware.radio@1.1.so:android.hardware.radio@1.2.so:android.hardware.radio@1.3.so:android.hardware.radio@1.4.so:android.hardware.radio@1.5.so:android.hardware.secure_element@1.0.so:android.hardware.secure_element@1.1.so:android.hardware.secure_element@1.2.so:android.hardware.sensors@1.0.so:android.hardware.sensors@2.0.so:android.hardware.soundtrigger@2.0-core.so:android.hardware.soundtrigger@2.0.so:android.hardware.soundtrigger@2.1.so:android.hardware.soundtrigger@2.2.so:android.hardware.tetheroffload.config@1.0.so:android.hardware.tetheroffload.control@1.0.so:android.hardware.thermal@1.0.so:android.hardware.thermal@1.1.so:android.hardware.thermal@2.0.so:android.hardware.tv.cec@1.0.so:android.hardware.tv.cec@2.0.so:android.hardware.tv.input@1.0.so:android.hardware.tv.tuner@1.0.so:android.hardware.usb.gadget@1.0.so:android.hardware.usb@1.0.so:android.hardware.usb@1.1.so:android.hardware.usb@1.2.so:android.hardware.vibrator-V1-ndk_platform.so:android.hardware.vibrator@1.0.so:android.hardware.vibrator@1.1.so:android.hardware.vibrator@1.2.so:android.hardware.vibrator@1.3.so:android.hardware.vr@1.0.so:android.hardware.weaver@1.0.so:android.hardware.wifi.hostapd@1.0.so:android.hardware.wifi.hostapd@1.1.so:android.hardware.wifi.offload@1.0.so:android.hardware.wifi.supplicant@1.0.so:android.hardware.wifi.supplicant@1.1.so:android.hardware.wifi.supplicant@1.2.so:android.hardware.wifi@1.0.so:android.hardware.wifi@1.1.so:android.hardware.wifi@1.2.so:android.hardware.wifi@1.3.so:android.hidl.allocator@1.0.so:android.hidl.memory.block@1.0.so:android.hidl.token@1.0-utils.so:android.hidl.token@1.0.so:android.system.net.netd@1.0.so:android.system.net.netd@1.1.so:android.system.suspend@1.0.so:android.system.wifi.keystore@1.0.so:libadf.so:libaudioroute.so:libaudioutils.so:libbinder.so:libcamera_metadata.so:libcap.so:libclang_rt.scudo-i686-android.so:libclang_rt.scudo_minimal-i686-android.so:libclang_rt.ubsan_standalone-i686-android.so:libclang_rt.ubsan_standalone-x86_64-android.so:libcn-cbor.so:libcodec2.so:libcrypto.so:libcrypto_utils.so:libcurl.so:libdiskconfig.so:libdumpstateutil.so:libevent.so:libexif.so:libexpat.so:libfmq.so:libgatekeeper.so:libhardware_legacy.so:libhidlallocatorutils.so:libjpeg.so:libldacBT_abr.so:libldacBT_enc.so:liblz4.so:libmedia_helper.so:libmedia_omx.so:libmemtrack.so:libminijail.so:libmkbootimg_abi_check.so:libnetutils.so:libnl.so:libpcre2.so:libpiex.so:libpng.so:libpower.so:libprocinfo.so:libradio_metadata.so:libselinux.so:libspeexresampler.so:libsqlite.so:libssl.so:libstagefright_bufferpool@2.0.so:libstagefright_bufferqueue_helper.so:libstagefright_foundation.so:libstagefright_omx.so:libstagefright_omx_utils.so:libstagefright_xmlparser.so:libsysutils.so:libtinyalsa.so:libtinyxml2.so:libui.so:libusbhost.so:libwifi-system-iface.so:libxml2.so:libyuv.so:libziparchive.so namespace.default.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} @@ -825,18 +421,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.permitted.paths = /apex/com.android.art/${LIB} @@ -863,18 +455,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -886,21 +474,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -910,19 +494,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = system -namespace.com_android_runtime.link.system.shared_libs = libc.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.system.shared_libs = liblog.so +namespace.com_android_runtime.link.system.shared_libs += libc.so namespace.com_android_runtime.link.system.shared_libs += libdl.so namespace.com_android_runtime.link.system.shared_libs += libdl_android.so -namespace.com_android_runtime.link.system.shared_libs += liblog.so namespace.com_android_runtime.link.system.shared_libs += libm.so +namespace.com_android_runtime.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = false namespace.system.search.paths = /system/${LIB} namespace.system.search.paths += /system_ext/${LIB} @@ -958,33 +535,12 @@ namespace.vndk.asan.search.paths += /data/asan/vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /vendor/${LIB}/vndk namespace.vndk.asan.search.paths += /apex/com.android.vndk.vR/${LIB} namespace.vndk.links = system,default,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [unrestricted] @@ -1024,18 +580,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -1065,18 +617,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -1088,18 +636,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -1110,18 +654,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -1134,20 +674,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -1159,21 +695,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -1185,19 +717,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -1209,17 +737,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -1229,19 +753,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = false namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -1268,34 +785,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = false namespace.sphal.visible = true @@ -1315,62 +811,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.vndk.shared_libs += libz.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so:libz.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = false namespace.vndk.visible = true @@ -1399,33 +846,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,sphal,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [postinstall] diff --git a/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt index dc520c5..a638d34 100644 --- a/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.adbd/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libadbd_auth.so namespace.default.link.system.shared_libs += libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -54,18 +50,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -76,21 +68,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -101,19 +89,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt index b933d20..24935e6 100644 --- a/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.art/ld.config.txt @@ -16,18 +16,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -61,18 +57,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,system namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.system.shared_libs = libc.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.system.shared_libs += libdl.so -namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.system.shared_libs += liblog.so namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libc.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl.so +namespace.com_android_conscrypt.link.system.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.system.shared_libs += libm.so +namespace.com_android_conscrypt.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -83,18 +75,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -106,21 +94,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -131,19 +115,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt index 7b4a4fe..56fb1ca 100644 --- a/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.conscrypt/ld.config.txt @@ -11,18 +11,14 @@ namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = com_android_art,system namespace.default.link.com_android_art.shared_libs = libandroidio.so namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -33,18 +29,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -76,18 +68,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -98,21 +86,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -123,19 +107,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt index 9771bcb..333e3d6 100644 --- a/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.media.swcodec/ld.config.txt @@ -12,21 +12,17 @@ namespace.default.links = system namespace.default.link.system.shared_libs = libEGL.so namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libcgrouprc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so -namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so namespace.default.link.system.shared_libs += libnativewindow.so namespace.default.link.system.shared_libs += libsync.so namespace.default.link.system.shared_libs += libvndksupport.so +namespace.default.link.system.shared_libs += libc.so +namespace.default.link.system.shared_libs += libdl.so +namespace.default.link.system.shared_libs += libdl_android.so +namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -37,18 +33,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -80,18 +72,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -102,21 +90,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -127,19 +111,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -158,62 +138,13 @@ namespace.sphal.asan.permitted.paths += /odm/${LIB} namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = vndk,system -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so -namespace.sphal.link.system.shared_libs = libEGL.so -namespace.sphal.link.system.shared_libs += libGLESv1_CM.so -namespace.sphal.link.system.shared_libs += libGLESv2.so -namespace.sphal.link.system.shared_libs += libGLESv3.so -namespace.sphal.link.system.shared_libs += libRS.so -namespace.sphal.link.system.shared_libs += libandroid_net.so -namespace.sphal.link.system.shared_libs += libbinder_ndk.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so +namespace.sphal.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.sphal.link.system.shared_libs += libc.so -namespace.sphal.link.system.shared_libs += libcgrouprc.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.system.shared_libs += libdl.so namespace.sphal.link.system.shared_libs += libdl_android.so -namespace.sphal.link.system.shared_libs += liblog.so namespace.sphal.link.system.shared_libs += libm.so -namespace.sphal.link.system.shared_libs += libmediandk.so -namespace.sphal.link.system.shared_libs += libnativewindow.so -namespace.sphal.link.system.shared_libs += libneuralnetworks.so -namespace.sphal.link.system.shared_libs += libsync.so -namespace.sphal.link.system.shared_libs += libvndksupport.so -namespace.sphal.link.system.shared_libs += libvulkan.so -namespace.sphal.link.system.shared_libs += libz.so +namespace.sphal.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.system.isolated = true namespace.system.visible = true namespace.system.search.paths = /system/${LIB} @@ -258,33 +189,11 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = system,sphal,com_android_neuralnetworks -namespace.vndk.link.system.shared_libs = libEGL.so -namespace.vndk.link.system.shared_libs += libGLESv1_CM.so -namespace.vndk.link.system.shared_libs += libGLESv2.so -namespace.vndk.link.system.shared_libs += libGLESv3.so -namespace.vndk.link.system.shared_libs += libRS.so -namespace.vndk.link.system.shared_libs += libandroid_net.so -namespace.vndk.link.system.shared_libs += libbinder_ndk.so +namespace.vndk.link.system.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.vndk.link.system.shared_libs += libc.so -namespace.vndk.link.system.shared_libs += libcgrouprc.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.system.shared_libs += libdl.so namespace.vndk.link.system.shared_libs += libdl_android.so -namespace.vndk.link.system.shared_libs += liblog.so namespace.vndk.link.system.shared_libs += libm.so -namespace.vndk.link.system.shared_libs += libmediandk.so -namespace.vndk.link.system.shared_libs += libnativewindow.so -namespace.vndk.link.system.shared_libs += libneuralnetworks.so -namespace.vndk.link.system.shared_libs += libsync.so -namespace.vndk.link.system.shared_libs += libvndksupport.so -namespace.vndk.link.system.shared_libs += libvulkan.so -namespace.vndk.link.system.shared_libs += libz.so +namespace.vndk.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.sphal.allow_all_shared_libs = true namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so diff --git a/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt index 3a40c4c..29c727e 100644 --- a/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.runtime/ld.config.txt @@ -9,19 +9,12 @@ namespace.default.asan.search.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system -namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.default.link.system.shared_libs = liblog.so +namespace.default.link.system.shared_libs += libc.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so -namespace.default.link.system.shared_libs += liblog.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -32,18 +25,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -75,18 +64,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -97,21 +82,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -122,19 +103,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt b/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt index 97d0fd1..450aa99 100644 --- a/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt +++ b/testdata/golden_output/vndk-lite/com.android.sdkext/ld.config.txt @@ -10,17 +10,10 @@ namespace.default.asan.permitted.paths = /apex/com.android.sdkext/${LIB} namespace.default.asan.permitted.paths += /system/${LIB} namespace.default.links = system namespace.default.link.system.shared_libs = libc.so -namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.default.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.default.link.system.shared_libs += libdl.so namespace.default.link.system.shared_libs += libdl_android.so namespace.default.link.system.shared_libs += libm.so +namespace.default.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.isolated = true namespace.com_android_adbd.search.paths = /apex/com.android.adbd/${LIB} namespace.com_android_adbd.permitted.paths = /apex/com.android.adbd/${LIB} @@ -31,18 +24,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = system namespace.com_android_adbd.link.system.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.system.shared_libs += libc.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.system.shared_libs += libdl.so -namespace.com_android_adbd.link.system.shared_libs += libdl_android.so namespace.com_android_adbd.link.system.shared_libs += liblog.so namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libc.so +namespace.com_android_adbd.link.system.shared_libs += libdl.so +namespace.com_android_adbd.link.system.shared_libs += libdl_android.so +namespace.com_android_adbd.link.system.shared_libs += libm.so +namespace.com_android_adbd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -74,18 +63,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = system namespace.com_android_i18n.link.system.shared_libs = libc.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.system.shared_libs += libdl.so -namespace.com_android_i18n.link.system.shared_libs += libdl_android.so namespace.com_android_i18n.link.system.shared_libs += liblog.so namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libc.so +namespace.com_android_i18n.link.system.shared_libs += libdl.so +namespace.com_android_i18n.link.system.shared_libs += libdl_android.so +namespace.com_android_i18n.link.system.shared_libs += libm.so +namespace.com_android_i18n.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} namespace.com_android_neuralnetworks.permitted.paths = /apex/com.android.neuralnetworks/${LIB} @@ -96,21 +81,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = system namespace.com_android_neuralnetworks.link.system.shared_libs = libc.so namespace.com_android_neuralnetworks.link.system.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.system.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so namespace.com_android_neuralnetworks.link.system.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.system.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.system.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -121,19 +102,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = system,com_android_art namespace.com_android_os_statsd.link.system.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.system.shared_libs += libc.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.system.shared_libs += libdl.so -namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.system.shared_libs += libincident.so namespace.com_android_os_statsd.link.system.shared_libs += liblog.so namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libc.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl.so +namespace.com_android_os_statsd.link.system.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.system.shared_libs += libm.so +namespace.com_android_os_statsd.link.system.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.system.isolated = true namespace.system.visible = true diff --git a/testdata/golden_output/vndk-lite/ld.config.txt b/testdata/golden_output/vndk-lite/ld.config.txt index ebe06b0..766e6e9 100644 --- a/testdata/golden_output/vndk-lite/ld.config.txt +++ b/testdata/golden_output/vndk-lite/ld.config.txt @@ -60,18 +60,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -101,18 +97,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -124,18 +116,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -146,18 +134,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -170,20 +154,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -195,21 +175,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -221,19 +197,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -245,17 +217,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -265,19 +233,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = true namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -304,35 +265,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so -namespace.rs.link.default.shared_libs += libz.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = true namespace.sphal.visible = true @@ -352,62 +291,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.default.shared_libs += libz.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = true namespace.vndk.visible = true @@ -435,34 +325,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so -namespace.vndk.link.default.shared_libs += libz.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [vendor] additional.namespaces = com_android_adbd,com_android_art,com_android_i18n,com_android_neuralnetworks,com_android_os_statsd,com_android_resolv,com_android_runtime @@ -527,18 +395,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} namespace.com_android_art.permitted.paths = /apex/com.android.art/${LIB} @@ -565,18 +429,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -588,21 +448,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} namespace.com_android_os_statsd.permitted.paths = /apex/com.android.os.statsd/${LIB} @@ -613,19 +469,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -637,17 +489,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -657,19 +505,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so [unrestricted] additional.namespaces = com_android_adbd,com_android_art,com_android_conscrypt,com_android_cronet,com_android_i18n,com_android_media,com_android_neuralnetworks,com_android_os_statsd,com_android_resolv,com_android_runtime,rs,sphal,vndk namespace.default.isolated = false @@ -707,18 +548,14 @@ namespace.com_android_adbd.asan.permitted.paths += /system/${LIB} namespace.com_android_adbd.links = default namespace.com_android_adbd.link.default.shared_libs = libadbd_auth.so namespace.com_android_adbd.link.default.shared_libs += libc.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_adbd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_adbd.link.default.shared_libs += libdl.so -namespace.com_android_adbd.link.default.shared_libs += libdl_android.so namespace.com_android_adbd.link.default.shared_libs += liblog.so namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libc.so +namespace.com_android_adbd.link.default.shared_libs += libdl.so +namespace.com_android_adbd.link.default.shared_libs += libdl_android.so +namespace.com_android_adbd.link.default.shared_libs += libm.so +namespace.com_android_adbd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_art.isolated = true namespace.com_android_art.visible = true namespace.com_android_art.search.paths = /apex/com.android.art/${LIB} @@ -748,18 +585,14 @@ namespace.com_android_conscrypt.asan.permitted.paths += /system/${LIB} namespace.com_android_conscrypt.links = com_android_art,default namespace.com_android_conscrypt.link.com_android_art.shared_libs = libandroidio.so namespace.com_android_conscrypt.link.default.shared_libs = libc.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_conscrypt.link.default.shared_libs += libdl.so -namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so namespace.com_android_conscrypt.link.default.shared_libs += liblog.so namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libc.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl.so +namespace.com_android_conscrypt.link.default.shared_libs += libdl_android.so +namespace.com_android_conscrypt.link.default.shared_libs += libm.so +namespace.com_android_conscrypt.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.isolated = true namespace.com_android_cronet.visible = true namespace.com_android_cronet.search.paths = /apex/com.android.cronet/${LIB} @@ -771,18 +604,14 @@ namespace.com_android_cronet.asan.permitted.paths += /system/${LIB} namespace.com_android_cronet.links = default namespace.com_android_cronet.link.default.shared_libs = libandroid.so namespace.com_android_cronet.link.default.shared_libs += libc.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_cronet.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_cronet.link.default.shared_libs += libdl.so -namespace.com_android_cronet.link.default.shared_libs += libdl_android.so namespace.com_android_cronet.link.default.shared_libs += liblog.so namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libc.so +namespace.com_android_cronet.link.default.shared_libs += libdl.so +namespace.com_android_cronet.link.default.shared_libs += libdl_android.so +namespace.com_android_cronet.link.default.shared_libs += libm.so +namespace.com_android_cronet.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.isolated = true namespace.com_android_i18n.visible = true namespace.com_android_i18n.search.paths = /apex/com.android.i18n/${LIB} @@ -793,18 +622,14 @@ namespace.com_android_i18n.asan.permitted.paths = /apex/com.android.i18n/${LIB} namespace.com_android_i18n.asan.permitted.paths += /system/${LIB} namespace.com_android_i18n.links = default namespace.com_android_i18n.link.default.shared_libs = libc.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_i18n.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_i18n.link.default.shared_libs += libdl.so -namespace.com_android_i18n.link.default.shared_libs += libdl_android.so namespace.com_android_i18n.link.default.shared_libs += liblog.so namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libc.so +namespace.com_android_i18n.link.default.shared_libs += libdl.so +namespace.com_android_i18n.link.default.shared_libs += libdl_android.so +namespace.com_android_i18n.link.default.shared_libs += libm.so +namespace.com_android_i18n.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.isolated = true namespace.com_android_media.visible = true namespace.com_android_media.search.paths = /apex/com.android.media/${LIB} @@ -817,20 +642,16 @@ namespace.com_android_media.links = default namespace.com_android_media.link.default.shared_libs = libbinder_ndk.so namespace.com_android_media.link.default.shared_libs += libc.so namespace.com_android_media.link.default.shared_libs += libcgrouprc.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_media.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_media.link.default.shared_libs += libdl.so -namespace.com_android_media.link.default.shared_libs += libdl_android.so namespace.com_android_media.link.default.shared_libs += liblog.so namespace.com_android_media.link.default.shared_libs += libm.so namespace.com_android_media.link.default.shared_libs += libmediandk.so namespace.com_android_media.link.default.shared_libs += libvndksupport.so +namespace.com_android_media.link.default.shared_libs += libc.so +namespace.com_android_media.link.default.shared_libs += libdl.so +namespace.com_android_media.link.default.shared_libs += libdl_android.so +namespace.com_android_media.link.default.shared_libs += libm.so +namespace.com_android_media.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.isolated = true namespace.com_android_neuralnetworks.visible = true namespace.com_android_neuralnetworks.search.paths = /apex/com.android.neuralnetworks/${LIB} @@ -842,21 +663,17 @@ namespace.com_android_neuralnetworks.asan.permitted.paths += /system/${LIB} namespace.com_android_neuralnetworks.links = default namespace.com_android_neuralnetworks.link.default.shared_libs = libc.so namespace.com_android_neuralnetworks.link.default.shared_libs += libcgrouprc.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so -namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so namespace.com_android_neuralnetworks.link.default.shared_libs += liblog.so namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so namespace.com_android_neuralnetworks.link.default.shared_libs += libnativewindow.so namespace.com_android_neuralnetworks.link.default.shared_libs += libneuralnetworks_packageinfo.so namespace.com_android_neuralnetworks.link.default.shared_libs += libvndksupport.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libc.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libdl_android.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libm.so +namespace.com_android_neuralnetworks.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.isolated = true namespace.com_android_os_statsd.visible = true namespace.com_android_os_statsd.search.paths = /apex/com.android.os.statsd/${LIB} @@ -868,19 +685,15 @@ namespace.com_android_os_statsd.asan.permitted.paths += /system/${LIB} namespace.com_android_os_statsd.links = default,com_android_art namespace.com_android_os_statsd.link.default.shared_libs = libbinder_ndk.so namespace.com_android_os_statsd.link.default.shared_libs += libc.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.default.shared_libs += libdl.so -namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so namespace.com_android_os_statsd.link.default.shared_libs += libincident.so namespace.com_android_os_statsd.link.default.shared_libs += liblog.so namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libc.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl.so +namespace.com_android_os_statsd.link.default.shared_libs += libdl_android.so +namespace.com_android_os_statsd.link.default.shared_libs += libm.so +namespace.com_android_os_statsd.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_os_statsd.link.com_android_art.shared_libs = libnativehelper.so namespace.com_android_resolv.isolated = true namespace.com_android_resolv.search.paths = /apex/com.android.resolv/${LIB} @@ -892,17 +705,13 @@ namespace.com_android_resolv.asan.permitted.paths += /system/${LIB} namespace.com_android_resolv.links = default namespace.com_android_resolv.link.default.shared_libs = libbinder_ndk.so namespace.com_android_resolv.link.default.shared_libs += libc.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_resolv.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_resolv.link.default.shared_libs += libdl.so +namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libc.so namespace.com_android_resolv.link.default.shared_libs += libdl.so namespace.com_android_resolv.link.default.shared_libs += libdl_android.so namespace.com_android_resolv.link.default.shared_libs += libm.so +namespace.com_android_resolv.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.com_android_runtime.isolated = true namespace.com_android_runtime.visible = true namespace.com_android_runtime.search.paths = /apex/com.android.runtime/${LIB} @@ -912,19 +721,12 @@ namespace.com_android_runtime.asan.search.paths = /apex/com.android.runtime/${LI namespace.com_android_runtime.asan.permitted.paths = /apex/com.android.runtime/${LIB} namespace.com_android_runtime.asan.permitted.paths += /system/${LIB} namespace.com_android_runtime.links = default -namespace.com_android_runtime.link.default.shared_libs = libc.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.com_android_runtime.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so +namespace.com_android_runtime.link.default.shared_libs = liblog.so +namespace.com_android_runtime.link.default.shared_libs += libc.so namespace.com_android_runtime.link.default.shared_libs += libdl.so namespace.com_android_runtime.link.default.shared_libs += libdl_android.so -namespace.com_android_runtime.link.default.shared_libs += liblog.so namespace.com_android_runtime.link.default.shared_libs += libm.so +namespace.com_android_runtime.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.isolated = false namespace.rs.visible = true namespace.rs.search.paths = /odm/${LIB}/vndk-sp @@ -951,35 +753,13 @@ namespace.rs.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.rs.asan.permitted.paths += /vendor/${LIB} namespace.rs.asan.permitted.paths += /data namespace.rs.links = default,com_android_neuralnetworks -namespace.rs.link.default.shared_libs = libEGL.so -namespace.rs.link.default.shared_libs += libGLESv1_CM.so -namespace.rs.link.default.shared_libs += libGLESv2.so -namespace.rs.link.default.shared_libs += libGLESv3.so -namespace.rs.link.default.shared_libs += libRS.so -namespace.rs.link.default.shared_libs += libandroid_net.so -namespace.rs.link.default.shared_libs += libbinder_ndk.so +namespace.rs.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so +namespace.rs.link.default.shared_libs += libft2.so namespace.rs.link.default.shared_libs += libc.so -namespace.rs.link.default.shared_libs += libcgrouprc.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.rs.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.default.shared_libs += libdl.so namespace.rs.link.default.shared_libs += libdl_android.so -namespace.rs.link.default.shared_libs += libft2.so -namespace.rs.link.default.shared_libs += liblog.so namespace.rs.link.default.shared_libs += libm.so -namespace.rs.link.default.shared_libs += libmediandk.so -namespace.rs.link.default.shared_libs += libnativewindow.so -namespace.rs.link.default.shared_libs += libneuralnetworks.so -namespace.rs.link.default.shared_libs += libsync.so -namespace.rs.link.default.shared_libs += libvndksupport.so -namespace.rs.link.default.shared_libs += libvulkan.so -namespace.rs.link.default.shared_libs += libz.so +namespace.rs.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.rs.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.sphal.isolated = false namespace.sphal.visible = true @@ -999,62 +779,13 @@ namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} namespace.sphal.asan.permitted.paths += /vendor/${LIB} namespace.sphal.links = rs,default,vndk,com_android_neuralnetworks namespace.sphal.link.rs.shared_libs = libRS_internal.so -namespace.sphal.link.default.shared_libs = libEGL.so -namespace.sphal.link.default.shared_libs += libGLESv1_CM.so -namespace.sphal.link.default.shared_libs += libGLESv2.so -namespace.sphal.link.default.shared_libs += libGLESv3.so -namespace.sphal.link.default.shared_libs += libRS.so -namespace.sphal.link.default.shared_libs += libandroid_net.so -namespace.sphal.link.default.shared_libs += libbinder_ndk.so +namespace.sphal.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.sphal.link.default.shared_libs += libc.so -namespace.sphal.link.default.shared_libs += libcgrouprc.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.sphal.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.sphal.link.default.shared_libs += libdl.so namespace.sphal.link.default.shared_libs += libdl_android.so -namespace.sphal.link.default.shared_libs += liblog.so namespace.sphal.link.default.shared_libs += libm.so -namespace.sphal.link.default.shared_libs += libmediandk.so -namespace.sphal.link.default.shared_libs += libnativewindow.so -namespace.sphal.link.default.shared_libs += libneuralnetworks.so -namespace.sphal.link.default.shared_libs += libsync.so -namespace.sphal.link.default.shared_libs += libvndksupport.so -namespace.sphal.link.default.shared_libs += libvulkan.so -namespace.sphal.link.default.shared_libs += libz.so -namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.common@1.2.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@2.1.so -namespace.sphal.link.vndk.shared_libs += android.hardware.graphics.mapper@3.0.so -namespace.sphal.link.vndk.shared_libs += android.hardware.renderscript@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory.token@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0-impl.so -namespace.sphal.link.vndk.shared_libs += android.hidl.memory@1.0.so -namespace.sphal.link.vndk.shared_libs += android.hidl.safe_union@1.0.so -namespace.sphal.link.vndk.shared_libs += libRSCpuRef.so -namespace.sphal.link.vndk.shared_libs += libRSDriver.so -namespace.sphal.link.vndk.shared_libs += libRS_internal.so -namespace.sphal.link.vndk.shared_libs += libbase.so -namespace.sphal.link.vndk.shared_libs += libbcinfo.so -namespace.sphal.link.vndk.shared_libs += libc++.so -namespace.sphal.link.vndk.shared_libs += libcutils.so -namespace.sphal.link.vndk.shared_libs += libhardware.so -namespace.sphal.link.vndk.shared_libs += libhidlbase.so -namespace.sphal.link.vndk.shared_libs += libhidlmemory.so -namespace.sphal.link.vndk.shared_libs += libion.so -namespace.sphal.link.vndk.shared_libs += libjsoncpp.so -namespace.sphal.link.vndk.shared_libs += liblzma.so -namespace.sphal.link.vndk.shared_libs += libprocessgroup.so -namespace.sphal.link.vndk.shared_libs += libunwindstack.so -namespace.sphal.link.vndk.shared_libs += libutils.so -namespace.sphal.link.vndk.shared_libs += libutilscallstack.so +namespace.sphal.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so +namespace.sphal.link.vndk.shared_libs = android.hardware.graphics.common@1.0.so:android.hardware.graphics.common@1.1.so:android.hardware.graphics.common@1.2.so:android.hardware.graphics.mapper@2.0.so:android.hardware.graphics.mapper@2.1.so:android.hardware.graphics.mapper@3.0.so:android.hardware.renderscript@1.0.so:android.hidl.memory.token@1.0.so:android.hidl.memory@1.0-impl.so:android.hidl.memory@1.0.so:android.hidl.safe_union@1.0.so:libRSCpuRef.so:libRSDriver.so:libRS_internal.so:libbase.so:libbcinfo.so:libc++.so:libcutils.so:libhardware.so:libhidlbase.so:libhidlmemory.so:libion.so:libjsoncpp.so:liblzma.so:libprocessgroup.so:libunwindstack.so:libutils.so:libutilscallstack.so namespace.sphal.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so namespace.vndk.isolated = false namespace.vndk.visible = true @@ -1082,34 +813,12 @@ namespace.vndk.asan.permitted.paths += /data/asan/vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /vendor/${LIB}/egl namespace.vndk.asan.permitted.paths += /apex/com.android.vndk.vR/${LIB}/hw namespace.vndk.links = default,com_android_neuralnetworks -namespace.vndk.link.default.shared_libs = libEGL.so -namespace.vndk.link.default.shared_libs += libGLESv1_CM.so -namespace.vndk.link.default.shared_libs += libGLESv2.so -namespace.vndk.link.default.shared_libs += libGLESv3.so -namespace.vndk.link.default.shared_libs += libRS.so -namespace.vndk.link.default.shared_libs += libandroid_net.so -namespace.vndk.link.default.shared_libs += libbinder_ndk.so +namespace.vndk.link.default.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libbinder_ndk.so:libc.so:libcgrouprc.so:libclang_rt.asan-i686-android.so:libdl.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libz.so namespace.vndk.link.default.shared_libs += libc.so -namespace.vndk.link.default.shared_libs += libcgrouprc.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.asan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.hwasan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.tsan-i686-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-arm-android.so -namespace.vndk.link.default.shared_libs += libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.default.shared_libs += libdl.so namespace.vndk.link.default.shared_libs += libdl_android.so -namespace.vndk.link.default.shared_libs += liblog.so namespace.vndk.link.default.shared_libs += libm.so -namespace.vndk.link.default.shared_libs += libmediandk.so -namespace.vndk.link.default.shared_libs += libnativewindow.so -namespace.vndk.link.default.shared_libs += libneuralnetworks.so -namespace.vndk.link.default.shared_libs += libsync.so -namespace.vndk.link.default.shared_libs += libvndksupport.so -namespace.vndk.link.default.shared_libs += libvulkan.so -namespace.vndk.link.default.shared_libs += libz.so +namespace.vndk.link.default.shared_libs += libclang_rt.asan-arm-android.so:libclang_rt.asan-i686-android.so:libclang_rt.hwasan-arm-android.so:libclang_rt.hwasan-i686-android.so:libclang_rt.tsan-arm-android.so:libclang_rt.tsan-i686-android.so:libclang_rt.ubsan_standalone-arm-android.so:libclang_rt.ubsan_standalone-i686-android.so namespace.vndk.link.com_android_neuralnetworks.shared_libs = libneuralnetworks.so [postinstall] namespace.default.isolated = false |