openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ALLOW_MISSING_DEPENDENCIES=true builds am: 1255a561e6 

am: 3e03e9a6bc

Change-Id: Ie7856aa23fe76d78f3d6d5bced8da4df1acca7a5
This commit is contained in:
Colin Cross 2019-03-07 18:19:31 -08:00 committed by android-build-merger
parent c8c75a9b24 3e03e9a6bc
commit 91d57f7e97
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/module.go
View File

@ -1441,7 +1441,11 @@ func (ctx *androidModuleContext) ExpandSourcesSubDir(srcFiles, excludes []string
if m := SrcIsModule(e); m != "" { if m := SrcIsModule(e); m != "" {
module := ctx.GetDirectDepWithTag(m, SourceDepTag) module := ctx.GetDirectDepWithTag(m, SourceDepTag)
if module == nil { if module == nil {
ctx.ModuleErrorf(`missing dependency on %q, is the property annotated with android:"path"?`, m) if ctx.Config().AllowMissingDependencies() {
ctx.AddMissingDependencies([]string{m})
} else {
ctx.ModuleErrorf(`missing dependency on %q, is the property annotated with android:"path"?`, m)
}
continue continue
} }
if srcProducer, ok := module.(SourceFileProducer); ok { if srcProducer, ok := module.(SourceFileProducer); ok {
@ -1458,7 +1462,11 @@ func (ctx *androidModuleContext) ExpandSourcesSubDir(srcFiles, excludes []string
if m := SrcIsModule(s); m != "" { if m := SrcIsModule(s); m != "" {
module := ctx.GetDirectDepWithTag(m, SourceDepTag) module := ctx.GetDirectDepWithTag(m, SourceDepTag)
if module == nil { if module == nil {
ctx.ModuleErrorf(`missing dependency on %q, is the property annotated with android:"path"?`, m) if ctx.Config().AllowMissingDependencies() {
ctx.AddMissingDependencies([]string{m})
} else {
ctx.ModuleErrorf(`missing dependency on %q, is the property annotated with android:"path"?`, m)
}
continue continue
} }
if srcProducer, ok := module.(SourceFileProducer); ok { if srcProducer, ok := module.(SourceFileProducer); ok {