tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Prevent apex from using preferred prebuilt_boot_image"

Browse source
This commit is contained in:
Paul Duffin 2021-03-29 08:50:37 +00:00 committed by Gerrit Code Review
commit fed8df3424
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apex/apex.go
View file

@ -567,7 +567,7 @@ var (
certificateTag = dependencyTag{name: "certificate"}
executableTag = dependencyTag{name: "executable", payload: true}
fsTag = dependencyTag{name: "filesystem", payload: true}
bootImageTag = dependencyTag{name: "bootImage", payload: true}
bootImageTag = dependencyTag{name: "bootImage", payload: true, sourceOnly: true}
compatConfigTag = dependencyTag{name: "compatConfig", payload: true, sourceOnly: true}
javaLibTag = dependencyTag{name: "javaLib", payload: true}
jniLibTag = dependencyTag{name: "jniLib", payload: true}

15
apex/boot_image_test.go
View file

@ -190,6 +190,16 @@ func TestBootImageInApex(t *testing.T) {
"myapex",
],
}
// Make sure that a preferred prebuilt doesn't affect the apex.
prebuilt_boot_image {
name: "mybootimage",
image_name: "boot",
prefer: true,
apex_available: [
"myapex",
],
}
`)
ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
@ -206,6 +216,11 @@ func TestBootImageInApex(t *testing.T) {
"javalib/arm64/boot-foo.oat",
"javalib/arm64/boot-foo.vdex",
})
java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
`myapex.key`,
`mybootimage`,
})
}
// TODO(b/177892522) - add test for host apex.