commit | e0598a1cbd20d410d33d7849a3ef9f06e683031e | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 11 08:42:35 2023 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 11 08:42:35 2023 +0000 |
tree | 386c41f4d31ffba6795c267999a01554682f468f | |
parent | 8555ed864d381f4b6bfdcbbe2cdeee651ce261a3 [diff] | |
parent | 48aa22380e7dd36a68f64da66c97c865d710e840 [diff] |
Merge "Consider only preferred modules for jdeps"
diff --git a/java/jdeps.go b/java/jdeps.go index 3734335..a52b867 100644 --- a/java/jdeps.go +++ b/java/jdeps.go
@@ -52,6 +52,11 @@ return } + // Prevent including both prebuilts and matching source modules when one replaces the other. + if !android.IsModulePreferred(module) { + return + } + ideInfoProvider, ok := module.(android.IDEInfo) if !ok { return