openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Skip Bazel dist dir migration if not in dist mode or if Bazel dist dir does not exist."

This commit is contained in:
Rupert Shuttleworth 2020-12-17 03:26:12 +00:00 committed by Gerrit Code Review
parent f1c48afc31 534f15708f
commit e808dae1fd
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/soong_ui/main.go
View File

@ -174,7 +174,7 @@ func main() {
build.SetupOutDir(buildCtx, config) build.SetupOutDir(buildCtx, config)
if config.UseBazel() { if config.UseBazel() && config.Dist() {
defer populateExternalDistDir(buildCtx, config) defer populateExternalDistDir(buildCtx, config)
} }
@ -547,6 +547,12 @@ func populateExternalDistDir(ctx build.Context, config build.Config) {
return return
} }
// Make sure the internal DIST_DIR actually exists before trying to read from it
if _, err = os.Stat(internalDistDirPath); os.IsNotExist(err) {
ctx.Println("Skipping Bazel dist dir migration - nothing to do!")
return
}
// Make sure the external DIST_DIR actually exists before trying to write to it // Make sure the external DIST_DIR actually exists before trying to write to it
if err = os.MkdirAll(externalDistDirPath, 0755); err != nil { if err = os.MkdirAll(externalDistDirPath, 0755); err != nil {
ctx.Fatalf("Unable to make directory %s: %s", externalDistDirPath, err) ctx.Fatalf("Unable to make directory %s: %s", externalDistDirPath, err)