return current_linkerconfig_type_ == LinkerConfigType::Legacy;
}
+// TODO(b/153944540) : Remove VNDK Lite supports
bool Context::IsVndkliteConfig() const {
return current_linkerconfig_type_ == LinkerConfigType::Vndklite;
}
namespace {
// Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt.
-const std::vector<std::string> kVndkLiteArtLibs = {
+const std::vector<std::string> kVndkLiteVendorRequires = {
+ // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt.
"libdexfile_external.so",
"libdexfiled_external.so",
"libnativebridge.so",
"libnativehelper.so",
"libnativeloader.so",
+ "libandroidicu.so",
+ // TODO(b/122876336): Remove libpac.so once it's migrated to Webview
+ "libpac.so",
// TODO(b/120786417 or b/134659294): libicuuc.so
// and libicui18n.so are kept for app compat.
"libicui18n.so",
"libicuuc.so",
- // Workaround for b/124772622
- "libandroidicu.so",
+ // resolv
+ "libnetd_resolv.so",
+ // nn
+ "libneuralnetworks.so",
+ // statsd
+ "libstatspull.so",
+ "libstatssocket.so",
+ // adbd
+ "libadb_pairing_auth.so",
+ "libadb_pairing_connection.so",
+ "libadb_pairing_server.so",
};
} // namespace
ns.AddPermittedPath("/system/vendor", AsanPath::NONE);
if (is_vndklite) {
- ns.AddRequires(kVndkLiteArtLibs);
+ ns.AddRequires(kVndkLiteVendorRequires);
} else {
ns.GetLink(ctx.GetSystemNamespaceName())
.AddSharedLib(Var("LLNDK_LIBRARIES_VENDOR"));