StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict mixed build cquery to deps of depth 2." am: 8cdd6f007d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849693

Change-Id: I55f2bd60b00ec40d9bb4564c20de147b44466a21
This commit is contained in:
Liz Kammer
2021-10-08 17:23:50 +00:00
committed by Automerger Merge Worker
parent aff7f12f5a 8cdd6f007d
commit 1f93d920c2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/bazel_handler.go
View File

@@ -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"),

2
android/bazel_handler_test.go
View File

@@ -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 {