aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-03-23 08:01:59 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-23 08:01:59 -0700
commit235810e510337e958ec4ca209ad1c5ebc20fef02 (patch)
tree25ea6f53b28e10e7ab100ca1dcd5ded9a809361b /java
parent593bb1c16c91882409911f8fc5e418994af3ff02 (diff)
parentd139b8037c3e0cdcbf07ed3b0bc460c76c2782d0 (diff)
downloadbuild_soong-235810e510337e958ec4ca209ad1c5ebc20fef02.tar.gz
build_soong-235810e510337e958ec4ca209ad1c5ebc20fef02.tar.bz2
build_soong-235810e510337e958ec4ca209ad1c5ebc20fef02.zip
Merge "Don't visit disabled modules with SOONG_COLLECT_JAVA_DEPS=true" am: 6d75c9d18e am: 4e976b56be
am: d139b8037c Change-Id: I2007374b40673f07085a94d110cf65cfeda9570e
Diffstat (limited to 'java')
-rw-r--r--java/jdeps.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/jdeps.go b/java/jdeps.go
index 2eaeab8b..18498bef 100644
--- a/java/jdeps.go
+++ b/java/jdeps.go
@@ -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