From 99c19ca707391f0908313c7cee2ef315d2b5cb3c Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 29 Jan 2020 16:09:38 +0900 Subject: Update platform namespace name Platform namespace has been renamed as 'system' from linkerconfig generator. To meet this requirement, libnativeloader should search for namespace 'system' rather than namespace 'platform'. Bug: 147987608 Test: m -j passed Test: atest libnativeloader_test passed Change-Id: I23d865ac71a80619f291eb9ae0761a2cad5df352 --- libnativeloader/native_loader_namespace.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libnativeloader/native_loader_namespace.cpp') diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp index fff3191a75..6faa78cdde 100644 --- a/libnativeloader/native_loader_namespace.cpp +++ b/libnativeloader/native_loader_namespace.cpp @@ -35,7 +35,7 @@ namespace android { namespace { constexpr const char* kDefaultNamespaceName = "default"; -constexpr const char* kPlatformNamespaceName = "platform"; +constexpr const char* kSystemNamespaceName = "system"; std::string GetLinkerError(bool is_bridged) { const char* msg = is_bridged ? NativeBridgeGetError() : dlerror(); @@ -63,11 +63,11 @@ Result NativeLoaderNamespace::GetExportedNamespace(const return Errorf("namespace {} does not exist or exported", name); } -// The platform namespace is called "default" for binaries in /system and -// "platform" for those in the Runtime APEX. Try "platform" first since +// The system namespace is called "default" for binaries in /system and +// "system" for those in the Runtime APEX. Try "system" first since // "default" always exists. -Result NativeLoaderNamespace::GetPlatformNamespace(bool is_bridged) { - auto ns = GetExportedNamespace(kPlatformNamespaceName, is_bridged); +Result NativeLoaderNamespace::GetSystemNamespace(bool is_bridged) { + auto ns = GetExportedNamespace(kSystemNamespaceName, is_bridged); if (ns) return ns; ns = GetExportedNamespace(kDefaultNamespaceName, is_bridged); if (ns) return ns; @@ -93,12 +93,12 @@ Result NativeLoaderNamespace::Create( is_bridged = NativeBridgeIsPathSupported(search_paths.c_str()); } - // Fall back to the platform namespace if no parent is set. - auto platform_ns = GetPlatformNamespace(is_bridged); - if (!platform_ns) { - return platform_ns.error(); + // Fall back to the system namespace if no parent is set. + auto system_ns = GetSystemNamespace(is_bridged); + if (!system_ns) { + return system_ns.error(); } - const NativeLoaderNamespace& effective_parent = parent != nullptr ? *parent : *platform_ns; + const NativeLoaderNamespace& effective_parent = parent != nullptr ? *parent : *system_ns; // All namespaces for apps are isolated uint64_t type = ANDROID_NAMESPACE_TYPE_ISOLATED; -- cgit v1.2.3-59-g8ed1b