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

Add bootclasspath_fragment as an alias for boot_image

Browse Source 
This is part of the work to rename boot_image to bootclasspath_fragment
which is being done for two reasons:
1. To avoid clashing with the bootimg module type.
2. To better reflect what this represents.

While a bootclasspath_fragment can create what ART calls a boot image
(which is different to what the bootimg module type represents) it does
not have to do so.

Bug: 177892522
Test: m nothing
Change-Id: Ib45604be7adc790ded9e27a2ac812dd7522ca8db
This commit is contained in:
Paul Duffin
2021-03-29 11:02:53 +01:00
parent 837486d308
commit 4b64ba05b6
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/apex.go
View File

@@ -93,8 +93,14 @@ type apexBundleProperties struct {
Multilib apexMultilibProperties
// List of boot images that are embedded inside this APEX bundle.
//
// deprecated: Use Bootclasspath_fragments
// TODO(b/177892522): Remove after has been replaced by Bootclasspath_fragments
Boot_images []string
// List of bootclasspath fragments that are embedded inside this APEX bundle.
Bootclasspath_fragments []string
// List of java libraries that are embedded inside this APEX bundle.
Java_libs []string
@@ -748,6 +754,7 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
// Common-arch dependencies come next
commonVariation := ctx.Config().AndroidCommonTarget.Variations()
ctx.AddFarVariationDependencies(commonVariation, bootImageTag, a.properties.Boot_images...)
ctx.AddFarVariationDependencies(commonVariation, bootImageTag, a.properties.Bootclasspath_fragments...)
ctx.AddFarVariationDependencies(commonVariation, javaLibTag, a.properties.Java_libs...)
ctx.AddFarVariationDependencies(commonVariation, bpfTag, a.properties.Bpfs...)
ctx.AddFarVariationDependencies(commonVariation, fsTag, a.properties.Filesystems...)