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

Generate boot images for host from prebuilts am: a56be7d781 am: 9dfd930cf7

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

Change-Id: I2d343d227edb0b5138537f1fc3d36c4806340d51
This commit is contained in:
Paul Duffin
2021-07-06 15:28:37 +00:00
committed by Automerger Merge Worker
parent 688efcdbde 9dfd930cf7
commit b68c4c0b49
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/bootclasspath_fragment.go
View File

@@ -686,7 +686,16 @@ func (b *BootclasspathFragmentModule) generateBootImageBuildActions(ctx android.
// Build a profile for the image config and then use that to build the boot image.
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
}
// Collect information for opening IDE project files in java/jdeps.go.
@@ -957,6 +966,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
}