Use inclusive language in build/soong
Bug: 158889297
Test: m checkbuild
Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc
Merged-In: Id07890b7cbc2397291a658ca00e86b43c743aafc
(cherry picked from commit 440e0d0542043de48f66771f00b67be0de588476)
diff --git a/android/neverallow.go b/android/neverallow.go
index 9e075b7..8563ebd 100644
--- a/android/neverallow.go
+++ b/android/neverallow.go
@@ -166,7 +166,7 @@
}
func createJavaDeviceForHostRules() []Rule {
- javaDeviceForHostProjectsWhitelist := []string{
+ javaDeviceForHostProjectsAllowedList := []string{
"external/guava",
"external/robolectric-shadows",
"framework/layoutlib",
@@ -174,14 +174,14 @@
return []Rule{
NeverAllow().
- NotIn(javaDeviceForHostProjectsWhitelist...).
+ NotIn(javaDeviceForHostProjectsAllowedList...).
ModuleType("java_device_for_host", "java_host_for_device").
- Because("java_device_for_host can only be used in whitelisted projects"),
+ Because("java_device_for_host can only be used in allowed projects"),
}
}
func createCcSdkVariantRules() []Rule {
- sdkVersionOnlyWhitelist := []string{
+ sdkVersionOnlyAllowedList := []string{
// derive_sdk_prefer32 has stem: "derive_sdk" which conflicts with the derive_sdk.
// This sometimes works because the APEX modules that contain derive_sdk and
// derive_sdk_prefer32 suppress the platform installation rules, but fails when
@@ -189,7 +189,7 @@
"frameworks/base/apex/sdkextensions/derive_sdk",
}
- platformVariantPropertiesWhitelist := []string{
+ platformVariantPropertiesAllowedList := []string{
// android_native_app_glue and libRSSupport use native_window.h but target old
// sdk versions (minimum and 9 respectively) where libnativewindow didn't exist,
// so they can't add libnativewindow to shared_libs to get the header directory
@@ -201,13 +201,13 @@
return []Rule{
NeverAllow().
- NotIn(sdkVersionOnlyWhitelist...).
+ NotIn(sdkVersionOnlyAllowedList...).
WithMatcher("sdk_variant_only", isSetMatcherInstance).
- Because("sdk_variant_only can only be used in whitelisted projects"),
+ Because("sdk_variant_only can only be used in allowed projects"),
NeverAllow().
- NotIn(platformVariantPropertiesWhitelist...).
+ NotIn(platformVariantPropertiesAllowedList...).
WithMatcher("platform.shared_libs", isSetMatcherInstance).
- Because("platform variant properties can only be used in whitelisted projects"),
+ Because("platform variant properties can only be used in allowed projects"),
}
}