diff options
| -rw-r--r-- | libnativeloader/include/nativeloader/dlext_namespaces.h | 4 | ||||
| -rw-r--r-- | libnativeloader/library_namespaces.cpp | 2 | ||||
| -rw-r--r-- | libnativeloader/native_loader_namespace.cpp | 6 | ||||
| -rw-r--r-- | libnativeloader/native_loader_namespace.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libnativeloader/include/nativeloader/dlext_namespaces.h b/libnativeloader/include/nativeloader/dlext_namespaces.h index ed335eedd6..79537ef15f 100644 --- a/libnativeloader/include/nativeloader/dlext_namespaces.h +++ b/libnativeloader/include/nativeloader/dlext_namespaces.h @@ -45,10 +45,10 @@ enum { */ ANDROID_NAMESPACE_TYPE_SHARED = 2, - /* This flag instructs linker to enable grey-list workaround for the namespace. + /* This flag instructs linker to enable exempt-list workaround for the namespace. * See http://b/26394120 for details. */ - ANDROID_NAMESPACE_TYPE_GREYLIST_ENABLED = 0x08000000, + ANDROID_NAMESPACE_TYPE_EXEMPT_LIST_ENABLED = 0x08000000, /* This flag instructs linker to use this namespace as the anonymous * namespace. The anonymous namespace is used in the case when linker cannot diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp index 330903d028..3ef50e3abf 100644 --- a/libnativeloader/library_namespaces.cpp +++ b/libnativeloader/library_namespaces.cpp @@ -297,7 +297,7 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t // racing here. auto app_ns = NativeLoaderNamespace::Create( namespace_name, library_path, permitted_path, parent_ns, is_shared, - target_sdk_version < 24 /* is_greylist_enabled */, also_used_as_anonymous); + target_sdk_version < 24 /* is_exempt_list_enabled */, also_used_as_anonymous); if (!app_ns.ok()) { return app_ns.error(); } diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp index 79a9791dd0..fe15c70ac8 100644 --- a/libnativeloader/native_loader_namespace.cpp +++ b/libnativeloader/native_loader_namespace.cpp @@ -86,7 +86,7 @@ Result<NativeLoaderNamespace> NativeLoaderNamespace::GetSystemNamespace(bool is_ Result<NativeLoaderNamespace> NativeLoaderNamespace::Create( const std::string& name, const std::string& search_paths, const std::string& permitted_paths, - const NativeLoaderNamespace* parent, bool is_shared, bool is_greylist_enabled, + const NativeLoaderNamespace* parent, bool is_shared, bool is_exempt_list_enabled, bool also_used_as_anonymous) { bool is_bridged = false; if (parent != nullptr) { @@ -116,8 +116,8 @@ Result<NativeLoaderNamespace> NativeLoaderNamespace::Create( if (is_shared) { type |= ANDROID_NAMESPACE_TYPE_SHARED; } - if (is_greylist_enabled) { - type |= ANDROID_NAMESPACE_TYPE_GREYLIST_ENABLED; + if (is_exempt_list_enabled) { + type |= ANDROID_NAMESPACE_TYPE_EXEMPT_LIST_ENABLED; } if (!is_bridged) { diff --git a/libnativeloader/native_loader_namespace.h b/libnativeloader/native_loader_namespace.h index a295d18f6a..f6a324be56 100644 --- a/libnativeloader/native_loader_namespace.h +++ b/libnativeloader/native_loader_namespace.h @@ -42,7 +42,7 @@ struct NativeLoaderNamespace { const std::string& search_paths, const std::string& permitted_paths, const NativeLoaderNamespace* parent, bool is_shared, - bool is_greylist_enabled, + bool is_exempt_list_enabled, bool also_used_as_anonymous); NativeLoaderNamespace(NativeLoaderNamespace&&) = default; |