tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make prebuilt_apex report an error if no apex file is found" am: 846ce57a00 am: f63bae520d

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

Change-Id: Ia06b1912693977815b1b9c1ee3274b1bb9f88210
This commit is contained in:
Paul Duffin 2021-04-07 20:05:50 +00:00 committed by Automerger Merge Worker
commit 05cf32909e
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apex/apex_test.go
View file

@ -4316,6 +4316,14 @@ func TestPrebuilt(t *testing.T) {
}
}
func TestPrebuiltMissingSrc(t *testing.T) {
testApexError(t, `module "myapex" variant "android_common".*: prebuilt_apex does not support "arm64_armv8-a"`, `
prebuilt_apex {
name: "myapex",
}
`)
}
func TestPrebuiltFilenameOverride(t *testing.T) {
ctx := testApex(t, `
prebuilt_apex {

9
apex/prebuilt.go
View file

@ -152,14 +152,17 @@ func (p *ApexFileProperties) prebuiltApexSelector(ctx android.BaseModuleContext,
src = String(p.Arch.X86.Src)
case android.X86_64:
src = String(p.Arch.X86_64.Src)
default:
ctx.OtherModuleErrorf(prebuilt, "prebuilt_apex does not support %q", multiTargets[0].Arch.String())
return nil
}
if src == "" {
src = String(p.Src)
}
if src == "" {
ctx.OtherModuleErrorf(prebuilt, "prebuilt_apex does not support %q", multiTargets[0].Arch.String())
// Drop through to return an empty string as the src (instead of nil) to avoid the prebuilt
// logic from reporting a more general, less useful message.
}
return []string{src}
}