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

Merge changes from topics "soong-inclusive-language", "soong_inclusive_language2" into rvc-dev

Browse Source 
* changes:
  Use inclusive language in Android.bp files
  Use inclusive language in build/soong
This commit is contained in:
Colin Cross
2020-06-16 03:28:15 +00:00
committed by Android (Google) Code Review
parent c8697f6ae5 a44a6b27f9
commit f4a5492ec9
14 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex_test.go
View File

@@ -973,7 +973,7 @@ func TestApexDependsOnLLNDKTransitively(t *testing.T) {
symbol_file: "",
}
`, func(fs map[string][]byte, config android.Config) {
setUseVendorWhitelistForTest(config, []string{"myapex"})
setUseVendorAllowListForTest(config, []string{"myapex"})
}, withUnbundledBuild)
// Ensure that LLNDK dep is not included
@@ -1642,7 +1642,7 @@ func TestUseVendor(t *testing.T) {
apex_available: [ "myapex" ],
}
`, func(fs map[string][]byte, config android.Config) {
setUseVendorWhitelistForTest(config, []string{"myapex"})
setUseVendorAllowListForTest(config, []string{"myapex"})
})
inputsList := []string{}
@@ -1675,9 +1675,9 @@ func TestUseVendorRestriction(t *testing.T) {
private_key: "testkey.pem",
}
`, func(fs map[string][]byte, config android.Config) {
setUseVendorWhitelistForTest(config, []string{""})
setUseVendorAllowListForTest(config, []string{""})
})
// no error with whitelist
// no error with allow list
testApex(t, `
apex {
name: "myapex",
@@ -1690,7 +1690,7 @@ func TestUseVendorRestriction(t *testing.T) {
private_key: "testkey.pem",
}
`, func(fs map[string][]byte, config android.Config) {
setUseVendorWhitelistForTest(config, []string{"myapex"})
setUseVendorAllowListForTest(config, []string{"myapex"})
})
}
@@ -3422,7 +3422,7 @@ func TestApexUsesFailsIfUseVenderMismatch(t *testing.T) {
private_key: "testkey.pem",
}
`, func(fs map[string][]byte, config android.Config) {
setUseVendorWhitelistForTest(config, []string{"myapex"})
setUseVendorAllowListForTest(config, []string{"myapex"})
})
}