summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2019-10-08 10:40:51 +0100
committer Orion Hodson <oth@google.com> 2019-10-08 10:40:51 +0100
commit4b5438a9eabc90b47a16ea9afc589ec35a799f46 (patch)
tree0118d16578532578be1e0d907b6e6c2e77ea975f
parente89b8fb9195e3eaeb808be31357900c2c901ffd1 (diff)
Make apex_available respect AllowMissingDependencies
When SOONG_ALLOW_MISSING_DEPENDENCIES is defined in the build, don't fail if an apex_available entry is not available. This is for smaller Android manifests that may not include all APEX projects (e.g. master-art). Bug: 142300164 Test: able to build from master-art manifest. Change-Id: Ice1274f7dd143c4b1bf756e2cde93e217266affa
-rw-r--r--android/apex.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/apex.go b/android/apex.go
index d1adc31cd..c54809547 100644
--- a/android/apex.go
+++ b/android/apex.go
@@ -155,7 +155,7 @@ func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) {
if n == availableToPlatform || n == availableToAnyApex {
continue
}
- if !mctx.OtherModuleExists(n) {
+ if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() {
mctx.PropertyErrorf("apex_available", "%q is not a valid module name", n)
}
}