Don't visit disabled modules with SOONG_COLLECT_JAVA_DEPS=true

Calling AndroidMk() on a disabled module may not be safe because
the module will not have had GenerateAndroidBuildActions() called
on it to initialize the data structures that AndroidMk() expects
to exist.  Check module.Enabled() before generating IDE info.

Fixes: 129089976
Test: SOONG_COLLECT_JAVA_DEPS=true m nothing
Change-Id: Icd79088c532c1842801f2bf89d92bc1a67109936
This commit is contained in:
Colin Cross 2019-03-22 21:39:34 -07:00
parent 66f2e8701e
commit c48428a6bb
1 changed files with 4 additions and 0 deletions

View File

@ -51,6 +51,10 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
moduleInfos := make(map[string]android.IdeInfo)
ctx.VisitAllModules(func(module android.Module) {
if !module.Enabled() {
return
}
ideInfoProvider, ok := module.(android.IDEInfo)
if !ok {
return