Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa11aaf6 authored by Ilshat Aliyev's avatar Ilshat Aliyev Committed by Automerger Merge Worker
Browse files

Merge "Pass jars to the list of targets." into main am: 961ae40c am: 1869ac34 

Original change: https://android-review.googlesource.com/c/platform/build/+/3461694



Change-Id: I045e10f7105a757901c68e9eda8576967f2966b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31b6aebf 1869ac34

tools/ide_query/ide_query.go

+7 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ func main() { 


	var targets []string

	javaTargetsByFile := findJavaModules(javaFiles, javaModules)

	for _, t := range javaTargetsByFile {

		targets = append(targets, t)

	for _, target := range javaTargetsByFile {

		targets = append(targets, javaModules[target].Jars...)

	}



	ccTargets, err := getCCTargets(ctx, env, ccFiles)
@@ -306,6 +306,10 @@ func findJavaModules(paths []string, modules map[string]*javaModule) map[string] 
		}



		module := modules[name]

		if len(module.Jars) == 0 {

			continue

		}



		for i, p := range paths {

			if slices.Contains(module.Srcs, p) {

				ret[p] = name
@@ -317,6 +321,7 @@ func findJavaModules(paths []string, modules map[string]*javaModule) map[string] 
			break

		}

	}



	return ret

}