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

manual merge of 2ef16cfcd4 to rvc-dev-plus-aosp

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I768c3fe568fee764cb0b533e73a3fef719adf30c
This commit is contained in:
Colin Cross
2020-06-12 17:48:44 -07:00
parent 6f80e0517d 2ef16cfcd4
commit 973d6813cd
14 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apex/apex_test.go
View File

@@ -1143,7 +1143,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
@@ -1870,7 +1870,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{}
@@ -1903,9 +1903,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",
@@ -1918,7 +1918,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"})
})
}
@@ -3683,7 +3683,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"})
})
}