diff options
| author | Martin Stjernholm <mast@google.com> | 2020-02-11 22:57:14 +0000 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-12 16:45:29 +0000 |
| commit | f0e99bd50f2010e93a63d5675d3646afac73b37f (patch) | |
| tree | b710502c0734728ab7b2660f87fe848954ccfc4d /libnativeloader/library_namespaces.cpp | |
| parent | b584ea49a29150cb76e07648d683fde1828faed5 (diff) | |
Remove old "platform" namespace name in a few remaining places.
Follow-up to https://r.android.com/1220299.
Test: atest libnativeloader_test
Bug: 147987608
Change-Id: Ib5849c9a9f5dbde1bf2a85aad2fe96cc2a394f31
Diffstat (limited to 'libnativeloader/library_namespaces.cpp')
| -rw-r--r-- | libnativeloader/library_namespaces.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp index 5971917f56..8e9b6ea6da 100644 --- a/libnativeloader/library_namespaces.cpp +++ b/libnativeloader/library_namespaces.cpp @@ -245,12 +245,12 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t // ... and link to other namespaces to allow access to some public libraries bool is_bridged = app_ns->IsBridged(); - auto platform_ns = NativeLoaderNamespace::GetSystemNamespace(is_bridged); - if (!platform_ns.ok()) { - return platform_ns.error(); + auto system_ns = NativeLoaderNamespace::GetSystemNamespace(is_bridged); + if (!system_ns.ok()) { + return system_ns.error(); } - auto linked = app_ns->Link(*platform_ns, system_exposed_libraries); + auto linked = app_ns->Link(*system_ns, system_exposed_libraries); if (!linked.ok()) { return linked.error(); } @@ -298,7 +298,7 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t if (!vendor_public_libraries().empty()) { auto vendor_ns = NativeLoaderNamespace::GetExportedNamespace(kVendorNamespaceName, is_bridged); // when vendor_ns is not configured, link to the system namespace - auto target_ns = vendor_ns.ok() ? vendor_ns : platform_ns; + auto target_ns = vendor_ns.ok() ? vendor_ns : system_ns; if (target_ns.ok()) { linked = app_ns->Link(*target_ns, vendor_public_libraries()); if (!linked.ok()) { |