diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2020-04-15 17:02:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-15 17:02:36 +0000 |
| commit | 804302c7c021ec8c240ec4fbef3acce84f2e4d39 (patch) | |
| tree | 4636c89dc39f76c697f6ac1e46178ae69714fe5d | |
| parent | 45a24e9f988e7ec0c4634ee91acc4a7341490d83 (diff) | |
| parent | fde439ab4555a047bea49081c88218571e4bf2d9 (diff) | |
| download | linkerconfig-804302c7c021ec8c240ec4fbef3acce84f2e4d39.tar.gz | |
Match vendor requires with system from VNDK Lite am: fde439ab45
Change-Id: I96a10aa2bf4698a86d613c066e66fdbeac81cb2d
| -rw-r--r-- | contents/context/context.cc | 1 | ||||
| -rw-r--r-- | contents/namespace/vendordefault.cc | 21 |
2 files changed, 18 insertions, 4 deletions
diff --git a/contents/context/context.cc b/contents/context/context.cc index 38ffd2f..3ec30a4 100644 --- a/contents/context/context.cc +++ b/contents/context/context.cc @@ -50,6 +50,7 @@ bool Context::IsLegacyConfig() const { return current_linkerconfig_type_ == LinkerConfigType::Legacy; } +// TODO(b/153944540) : Remove VNDK Lite supports bool Context::IsVndkliteConfig() const { return current_linkerconfig_type_ == LinkerConfigType::Vndklite; } diff --git a/contents/namespace/vendordefault.cc b/contents/namespace/vendordefault.cc index cb650f1..f9b5f09 100644 --- a/contents/namespace/vendordefault.cc +++ b/contents/namespace/vendordefault.cc @@ -27,18 +27,31 @@ using android::linkerconfig::modules::Namespace; 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 @@ -87,7 +100,7 @@ Namespace BuildVendorDefaultNamespace([[maybe_unused]] const Context& ctx) { 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")); |