StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use inclusive language in build/soong

Browse Source 
Test: m checkbuild
Change-Id: Id07890b7cbc2397291a658ca00e86b43c743aafc
This commit is contained in:
Colin Cross
2020-06-11 11:32:11 -07:00
parent 1adc63ec3d
commit 440e0d0542
14 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/neverallow.go
View File

@@ -166,7 +166,7 @@ func createMediaRules() []Rule {
}
func createJavaDeviceForHostRules() []Rule {
javaDeviceForHostProjectsWhitelist := []string{
javaDeviceForHostProjectsAllowedList := []string{
"external/guava",
"external/robolectric-shadows",
"framework/layoutlib",
@@ -174,14 +174,14 @@ func createJavaDeviceForHostRules() []Rule {
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
@@ -193,7 +193,7 @@ func createCcSdkVariantRules() []Rule {
"tools/test/graphicsbenchmark/functional_tests/java",
}
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
@@ -205,13 +205,13 @@ func createCcSdkVariantRules() []Rule {
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"),
}
}