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

Merge "Add contents property to boot_image (and prebuilt_boot_image)" am: 8d3c44a986 am: b8f0b4e1bf

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

Change-Id: Ic8c97eb640ca5d6dc0de0a8ac08391ed73bc0a0a
This commit is contained in:
Paul Duffin
2021-03-30 17:44:23 +00:00
committed by Automerger Merge Worker
parent 868ae0a172 b8f0b4e1bf
commit af5736ea92
3 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/boot_image.go
View File

@@ -73,13 +73,13 @@ var _ android.ExcludeFromVisibilityEnforcementTag = bootImageContentDepTag
type bootImageProperties struct {
// The name of the image this represents.
//
// Must be one of "art" or "boot".
// If specified then it must be one of "art" or "boot".
Image_name *string
// The contents of this boot image, could be either java_library, java_sdk_library, or boot_image.
//
// The order of this list matters as it is the order that is used in the bootclasspath.
Contents []string `blueprint:"mutated"`
Contents []string
}
type BootImageModule struct {
@@ -104,6 +104,13 @@ func bootImageFactory() android.Module {
}
func bootImageConsistencyCheck(ctx android.EarlyModuleContext, m *BootImageModule) {
contents := m.properties.Contents
if m.properties.Image_name == nil && len(contents) == 0 {
ctx.ModuleErrorf(`neither of the "image_name" and "contents" properties have been supplied, please supply exactly one`)
}
if m.properties.Image_name != nil && len(contents) != 0 {
ctx.ModuleErrorf(`both of the "image_name" and "contents" properties have been supplied, please supply exactly one`)
}
imageName := proptools.String(m.properties.Image_name)
if imageName == "art" {
// Get the configuration for the art apex jars. Do not use getImageConfig(ctx) here as this is

24
java/boot_image_test.go
View File

@@ -101,3 +101,27 @@ func TestBootImageInconsistentArtConfiguration_ApexMixture(t *testing.T) {
}
`)
}
func TestBootImageWithoutImageNameOrContents(t *testing.T) {
prepareForTestWithBootImage.
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
`\Qneither of the "image_name" and "contents" properties\E`)).
RunTestWithBp(t, `
boot_image {
name: "boot-image",
}
`)
}
func TestBootImageWithImageNameAndContents(t *testing.T) {
prepareForTestWithBootImage.
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
`\Qboth of the "image_name" and "contents" properties\E`)).
RunTestWithBp(t, `
boot_image {
name: "boot-image",
image_name: "boot",
contents: ["other"],
}
`)
}