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 "Set platform and toolchain flags to canonicalized for cquery/aquery" am: 81314ff2e6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc4f8ce9f0c77672c6c95f31f77c0c99a571a7d4
This commit is contained in:
Christopher Parsons 2021-02-09 17:02:59 +00:00 committed by Automerger Merge Worker
parent c691acedbd 81314ff2e6
commit ce084346e5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/bazel_handler.go
View File

@ -234,6 +234,13 @@ func (context *bazelContext) issueBazelCommand(runName bazel.RunName, command st
cmdFlags = append(cmdFlags, labels...)
cmdFlags = append(cmdFlags, "--package_path=%workspace%/"+context.intermediatesDir())
cmdFlags = append(cmdFlags, "--profile="+shared.BazelMetricsFilename(context, runName))
// Set default platforms to canonicalized values for mixed builds requests. If these are set
// in the bazelrc, they will have values that are non-canonicalized, and thus be invalid.
// The actual platform values here may be overridden by configuration transitions from the buildroot.
cmdFlags = append(cmdFlags,
fmt.Sprintf("--platforms=%s", canonicalizeLabel("//build/bazel/platforms:generic_x86_64")))
cmdFlags = append(cmdFlags,
fmt.Sprintf("--extra_toolchains=%s", canonicalizeLabel("//prebuilts/clang/host/linux-x86:all")))
cmdFlags = append(cmdFlags, extraFlags...)
bazelCmd := exec.Command(context.bazelPath, cmdFlags...)