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

Merge "Rename UpdatableBootJars to ApexBootJars." am: 4102c0cc47 am: adb9e9f752

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1773912

Change-Id: Iecc5f48620b2d4e5390ab9a081b2193924bd0dda
This commit is contained in:
satayev
2021-07-26 18:29:56 +00:00
committed by Automerger Merge Worker
parent 3a0401ac77 adb9e9f752
commit ad6cb082a4
18 changed files with 105 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/apex_test.go
View File

@@ -7114,7 +7114,7 @@ func TestDexpreoptAccessDexFilesFromPrebuiltApex(t *testing.T) {
})
}
func testApexPermittedPackagesRules(t *testing.T, errmsg, bp string, apexBootJars []string, rules []android.Rule) {
func testApexPermittedPackagesRules(t *testing.T, errmsg, bp string, bootJars []string, rules []android.Rule) {
t.Helper()
bp += `
apex_key {
@@ -7139,11 +7139,11 @@ func testApexPermittedPackagesRules(t *testing.T, errmsg, bp string, apexBootJar
PrepareForTestWithApexBuildComponents,
android.PrepareForTestWithNeverallowRules(rules),
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
updatableBootJars := make([]string, 0, len(apexBootJars))
for _, apexBootJar := range apexBootJars {
updatableBootJars = append(updatableBootJars, "myapex:"+apexBootJar)
apexBootJars := make([]string, 0, len(bootJars))
for _, apexBootJar := range bootJars {
apexBootJars = append(apexBootJars, "myapex:"+apexBootJar)
}
variables.UpdatableBootJars = android.CreateTestConfiguredJarList(updatableBootJars)
variables.ApexBootJars = android.CreateTestConfiguredJarList(apexBootJars)
}),
fs.AddToFixture(),
).