commit 232db5e6df0b835e2542421257f9aa2d46a8ee77
author Ryan Prichard <rprichard@google.com> Mon Aug 03 15:32:13 2020 -0700
committer Ryan Prichard <rprichard@google.com> Tue Aug 04 21:41:28 2020 +0000
tree aac70143b957a9b66128791b5b58f26366ba7002
parent 85438f2ddf4d93598700c477710e80315668b396

Rename linker greylist to exempt-list

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

  #inclusivefixit

Bug: http://b/162536543
Test: device boots
Change-Id: Ia80fb2f3be6abdadbd061570d48a4ef0fefcfebc

libnativeloader/include/nativeloader/dlext_namespaces.h

diff --git a/libnativeloader/include/nativeloader/dlext_namespaces.h b/libnativeloader/include/nativeloader/dlext_namespaces.h
index ed335ee..79537ef 100644
--- a/libnativeloader/include/nativeloader/dlext_namespaces.h
+++ b/libnativeloader/include/nativeloader/dlext_namespaces.h
@@ -45,10 +45,10 @@
    */
   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

libnativeloader/library_namespaces.cpp

diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index 330903d..3ef50e3 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -297,7 +297,7 @@
   // 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();
   }

libnativeloader/native_loader_namespace.cpp

diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp
index 79a9791..fe15c70 100644
--- a/libnativeloader/native_loader_namespace.cpp
+++ b/libnativeloader/native_loader_namespace.cpp
@@ -86,7 +86,7 @@
 
 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 @@
   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) {

libnativeloader/native_loader_namespace.h

diff --git a/libnativeloader/native_loader_namespace.h b/libnativeloader/native_loader_namespace.h
index a295d18..f6a324b 100644
--- a/libnativeloader/native_loader_namespace.h
+++ b/libnativeloader/native_loader_namespace.h
@@ -42,7 +42,7 @@
                                               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;