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

Merge "ensure out/bazel_metrics exists before writing to cquery-buildroot_bazel_profile.gz" am: 7ed6612fa6

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

Change-Id: I9401f672367864c89afdee750fa910f9ba217409
This commit is contained in:
Treehugger Robot
2022-03-02 22:42:16 +00:00
committed by Automerger Merge Worker
parent a25eeab5e1 7ed6612fa6
commit 9688f00e3a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/bazel_handler.go
View File

@@ -664,7 +664,12 @@ func (context *bazelContext) InvokeBazel() error {
if err != nil { if err != nil {
return err return err
} }
if metricsDir := context.paths.BazelMetricsDir(); metricsDir != "" {
err = os.MkdirAll(metricsDir, 0777)
if err != nil {
return err
}
}
err = ioutil.WriteFile(filepath.Join(soongInjectionPath, "WORKSPACE.bazel"), []byte{}, 0666) err = ioutil.WriteFile(filepath.Join(soongInjectionPath, "WORKSPACE.bazel"), []byte{}, 0666)
if err != nil { if err != nil {
return err return err
@@ -716,9 +721,9 @@ func (context *bazelContext) InvokeBazel() error {
} }
} }
for val, _ := range context.requests { for val := range context.requests {
if cqueryResult, ok := cqueryResults[getCqueryId(val)]; ok { if cqueryResult, ok := cqueryResults[getCqueryId(val)]; ok {
context.results[val] = string(cqueryResult) context.results[val] = cqueryResult
} else { } else {
return fmt.Errorf("missing result for bazel target %s. query output: [%s], cquery err: [%s]", return fmt.Errorf("missing result for bazel target %s. query output: [%s], cquery err: [%s]",
getCqueryId(val), cqueryOutput, cqueryErr) getCqueryId(val), cqueryOutput, cqueryErr)