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

Commit 8cdd6f00 authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Restrict mixed build cquery to deps of depth 2."

parents 97b85314 c19d5cdc

android/bazel_handler.go

+1 −1
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ func (context *bazelContext) InvokeBazel() error { 
	cqueryOutput, cqueryErr, err = context.issueBazelCommand(

		context.paths,

		bazel.CqueryBuildRootRunName,

		bazelCommand{"cquery", fmt.Sprintf("deps(%s)", buildrootLabel)},

		bazelCommand{"cquery", fmt.Sprintf("deps(%s, 2)", buildrootLabel)},

		"--output=starlark",

		"--starlark:file="+absolutePath(cqueryFileRelpath))

	err = ioutil.WriteFile(filepath.Join(soongInjectionPath, "cquery.out"),

android/bazel_handler_test.go

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ func TestRequestResultsAfterInvokeBazel(t *testing.T) { 
	label := "//foo:bar"

	arch := Arm64

	bazelContext, _ := testBazelContext(t, map[bazelCommand]string{

		bazelCommand{command: "cquery", expression: "deps(@soong_injection//mixed_builds:buildroot)"}: `//foo:bar|arm64>>out/foo/bar.txt`,

		bazelCommand{command: "cquery", expression: "deps(@soong_injection//mixed_builds:buildroot, 2)"}: `//foo:bar|arm64>>out/foo/bar.txt`,

	})

	g, ok := bazelContext.GetOutputFiles(label, arch)

	if ok {