openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Generate boot images for host from prebuilts" into sc-dev am: d507060257 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15216505

Change-Id: I100fec6a236b48b15bae16ad3e6c5cccb42ffbce
This commit is contained in:
Paul Duffin 2021-07-07 09:17:43 +00:00 committed by Automerger Merge Worker
parent 103c8a760c d507060257
commit d0687fd6a4
3 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
java/bootclasspath_fragment.go
View File

@ -679,7 +679,16 @@ func (b *BootclasspathFragmentModule) generateBootImageBuildActions(ctx android.
// Build a profile for the image config and then use that to build the boot image. // Build a profile for the image config and then use that to build the boot image.
profile := bootImageProfileRule(ctx, imageConfig) profile := bootImageProfileRule(ctx, imageConfig)
return buildBootImage(ctx, imageConfig, profile)
// Build boot image files for the host variants.
buildBootImageVariantsForBuildOs(ctx, imageConfig, profile)
// Build boot image files for the android variants.
androidBootImageFilesByArch := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile)
// Return the boot image files for the android variants for inclusion in an APEX and to be zipped
// up for the dist.
return androidBootImageFilesByArch
} }
type bootclasspathFragmentMemberType struct { type bootclasspathFragmentMemberType struct {
@ -935,6 +944,12 @@ func (module *prebuiltBootclasspathFragmentModule) produceBootImageFiles(ctx and
} }
} }
// Build the boot image files for the host variants. These are built from the dex files provided
// by the contents of this module as prebuilt versions of the host boot image files are not
// available, i.e. there is no host specific prebuilt apex containing them. This has to be built
// without a profile as the prebuilt modules do not provide a profile.
buildBootImageVariantsForBuildOs(ctx, imageConfig, nil)
return files return files
} }

30
java/dexpreopt_bootjars.go
View File

@ -502,14 +502,36 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, srcBootDexJars
} }
} }
// buildBootImage takes a bootImageConfig, and creates rules to build it. // buildBootImageVariantsForAndroidOs generates rules to build the boot image variants for the
// android.Android OsType and returns a map from the architectures to the paths of the generated
// boot image files.
//
// The paths are returned because they are needed elsewhere in Soong, e.g. for populating an APEX.
func buildBootImageVariantsForAndroidOs(ctx android.ModuleContext, image *bootImageConfig, profile android.WritablePath) bootImageFilesByArch {
return buildBootImageForOsType(ctx, image, profile, android.Android)
}
// buildBootImageVariantsForBuildOs generates rules to build the boot image variants for the
// android.BuildOs OsType, i.e. the type of OS on which the build is being running.
//
// The files need to be generated into their predefined location because they are used from there
// both within Soong and outside, e.g. for ART based host side testing and also for use by some
// cloud based tools. However, they are not needed by callers of this function and so the paths do
// not need to be returned from this func, unlike the buildBootImageVariantsForAndroidOs func.
func buildBootImageVariantsForBuildOs(ctx android.ModuleContext, image *bootImageConfig, profile android.WritablePath) {
buildBootImageForOsType(ctx, image, profile, android.BuildOs)
}
// buildBootImageForOsType takes a bootImageConfig, a profile file and an android.OsType
// boot image files are required for and it creates rules to build the boot image
// files for all the required architectures for them.
// //
// It returns a map from android.ArchType to the predefined paths of the boot image files. // It returns a map from android.ArchType to the predefined paths of the boot image files.
func buildBootImage(ctx android.ModuleContext, image *bootImageConfig, profile android.WritablePath) bootImageFilesByArch { func buildBootImageForOsType(ctx android.ModuleContext, image *bootImageConfig, profile android.WritablePath, requiredOsType android.OsType) bootImageFilesByArch {
filesByArch := bootImageFilesByArch{} filesByArch := bootImageFilesByArch{}
for _, variant := range image.variants { for _, variant := range image.variants {
buildBootImageVariant(ctx, variant, profile) if variant.target.Os == requiredOsType {
if variant.target.Os == android.Android { buildBootImageVariant(ctx, variant, profile)
filesByArch[variant.target.Arch.ArchType] = variant.imagesDeps.Paths() filesByArch[variant.target.Arch.ArchType] = variant.imagesDeps.Paths()
} }
} }

11
java/platform_bootclasspath.go
View File

@ -421,10 +421,15 @@ func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.
// Build a profile for the image config and then use that to build the boot image. // Build a profile for the image config and then use that to build the boot image.
profile := bootImageProfileRule(ctx, imageConfig) profile := bootImageProfileRule(ctx, imageConfig)
bootImageFilesByArch := buildBootImage(ctx, imageConfig, profile)
// Zip the boot image files up. // Build boot image files for the android variants.
buildBootImageZipInPredefinedLocation(ctx, imageConfig, bootImageFilesByArch) androidBootImageFilesByArch := buildBootImageVariantsForAndroidOs(ctx, imageConfig, profile)
// Zip the android variant boot image files up.
buildBootImageZipInPredefinedLocation(ctx, imageConfig, androidBootImageFilesByArch)
// Build boot image files for the host variants. There are use directly by ART host side tests.
buildBootImageVariantsForBuildOs(ctx, imageConfig, profile)
dumpOatRules(ctx, imageConfig) dumpOatRules(ctx, imageConfig)
} }