Add contents property to boot_image (and prebuilt_boot_image)
Allows boot_image modules to be created for any module that contributes to the boot class path, e.g. core-i18n from the com.android.i18n. A boot_image module with a contents property cannot specify an image_name, and vice versa. Only those boot_image modules with an image_name create .art, .oat and .vdex files, either in their associated APEX or as part of the framework "boot" image. Bug: 177892522 Test: m nothing Change-Id: Idfc2bcf00dd6d3ed36ac4df46fcf18e8aa7e2c92
This commit is contained in:
@@ -315,4 +315,63 @@ func TestBootImageInPrebuiltArtApex(t *testing.T) {
|
||||
})
|
||||
}
|
||||
|
||||
func TestBootImageContentsNoName(t *testing.T) {
|
||||
result := android.GroupFixturePreparers(
|
||||
prepareForTestWithBootImage,
|
||||
prepareForTestWithMyapex,
|
||||
).RunTestWithBp(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
boot_images: [
|
||||
"mybootimage",
|
||||
],
|
||||
updatable: false,
|
||||
}
|
||||
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "foo",
|
||||
srcs: ["b.java"],
|
||||
installable: true,
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "bar",
|
||||
srcs: ["b.java"],
|
||||
installable: true,
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
}
|
||||
|
||||
boot_image {
|
||||
name: "mybootimage",
|
||||
contents: [
|
||||
"foo",
|
||||
"bar",
|
||||
],
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
}
|
||||
`)
|
||||
|
||||
// The apex is empty because the contents of boot_image are not transitively included, yet!
|
||||
ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{})
|
||||
|
||||
java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
|
||||
`myapex.key`,
|
||||
`mybootimage`,
|
||||
})
|
||||
}
|
||||
|
||||
// TODO(b/177892522) - add test for host apex.
|
||||
|
Reference in New Issue
Block a user