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

Merge "Extract ApexFileProperties from apex PrebuiltProperties" am: 4746ae400c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic34b9460e2c90559a6a57f290924c03ad1dbcc4d
This commit is contained in:
Paul Duffin
2021-01-14 11:52:57 +00:00
committed by Automerger Merge Worker
parent 3144918c99 4746ae400c
commit 191af7042f
1 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
apex/prebuilt.go
View File

@@ -107,7 +107,7 @@ type Prebuilt struct {
compatSymlinks []string compatSymlinks []string
} }
type PrebuiltProperties struct { type ApexFileProperties struct {
// the path to the prebuilt .apex file to import. // the path to the prebuilt .apex file to import.
Source string `blueprint:"mutated"` Source string `blueprint:"mutated"`
@@ -126,6 +126,38 @@ type PrebuiltProperties struct {
Src *string Src *string
} }
} }
}
func (p *ApexFileProperties) selectSource(ctx android.BottomUpMutatorContext) error {
// This is called before prebuilt_select and prebuilt_postdeps mutators
// The mutators requires that src to be set correctly for each arch so that
// arch variants are disabled when src is not provided for the arch.
if len(ctx.MultiTargets()) != 1 {
return fmt.Errorf("compile_multilib shouldn't be \"both\" for prebuilt_apex")
}
var src string
switch ctx.MultiTargets()[0].Arch.ArchType {
case android.Arm:
src = String(p.Arch.Arm.Src)
case android.Arm64:
src = String(p.Arch.Arm64.Src)
case android.X86:
src = String(p.Arch.X86.Src)
case android.X86_64:
src = String(p.Arch.X86_64.Src)
default:
return fmt.Errorf("prebuilt_apex does not support %q", ctx.MultiTargets()[0].Arch.String())
}
if src == "" {
src = String(p.Src)
}
p.Source = src
return nil
}
type PrebuiltProperties struct {
ApexFileProperties
Installable *bool Installable *bool
// Optional name for the installed apex. If unspecified, name of the // Optional name for the installed apex. If unspecified, name of the
@@ -175,31 +207,10 @@ func PrebuiltFactory() android.Module {
} }
func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) {
// This is called before prebuilt_select and prebuilt_postdeps mutators if err := p.properties.selectSource(ctx); err != nil {
// The mutators requires that src to be set correctly for each arch so that ctx.ModuleErrorf("%s", err)
// arch variants are disabled when src is not provided for the arch.
if len(ctx.MultiTargets()) != 1 {
ctx.ModuleErrorf("compile_multilib shouldn't be \"both\" for prebuilt_apex")
return return
} }
var src string
switch ctx.MultiTargets()[0].Arch.ArchType {
case android.Arm:
src = String(p.properties.Arch.Arm.Src)
case android.Arm64:
src = String(p.properties.Arch.Arm64.Src)
case android.X86:
src = String(p.properties.Arch.X86.Src)
case android.X86_64:
src = String(p.properties.Arch.X86_64.Src)
default:
ctx.ModuleErrorf("prebuilt_apex does not support %q", ctx.MultiTargets()[0].Arch.String())
return
}
if src == "" {
src = String(p.properties.Src)
}
p.properties.Source = src
} }
func (p *Prebuilt) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (p *Prebuilt) GenerateAndroidBuildActions(ctx android.ModuleContext) {