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

Merge "avoid error if bazel intermediates dir already exists" am: 965561ce43 am: 661302cf96

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4fb30274770651640202f469aa5db28206c8146
This commit is contained in:
Christopher Parsons
2021-01-20 19:01:54 +00:00
committed by Automerger Merge Worker
parent 3523ffa793 661302cf96
commit 0db3c5556e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/bazel_handler.go
View File

@@ -371,7 +371,11 @@ func (context *bazelContext) InvokeBazel() error {
var cqueryOutput string var cqueryOutput string
var err error var err error
err = os.Mkdir(absolutePath(context.intermediatesDir()), 0777) intermediatesDirPath := absolutePath(context.intermediatesDir())
if _, err := os.Stat(intermediatesDirPath); os.IsNotExist(err) {
err = os.Mkdir(intermediatesDirPath, 0777)
}
if err != nil { if err != nil {
return err return err
} }