Merge "Consider only preferred modules for jdeps"

2023-01-11 08:42:35 +00:00
parent 8555ed864d 48aa22380e
commit e0598a1cbd
1 changed files with 5 additions and 0 deletions
--- a/java/jdeps.go
+++ b/java/jdeps.go
@@ -52,6 +52,11 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
 			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