Make prebuilt_apex report an error if no apex file is found
Previously, if an appropriate src property was not specified it would
return "" which resolves to the top level directory. This change causes
it to report an error.
Bug: 181267622
Test: m droid
Change-Id: Ia5be324a0eff18e43b352d71c6768c8767986053
diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 68f2859..8c7e64c 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -152,14 +152,17 @@
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}
}