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

Add contents property to boot_image (and prebuilt_boot_image)

Browse Source 
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:
Paul Duffin
2021-03-24 01:34:57 +00:00
parent c7ef9892dd
commit 82886d6cbf
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