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

Mark queryview as experimental in the Ninja description. am: b05d62f584

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

Change-Id: I12079d602c8bc983509b1df0610066afefaae829
This commit is contained in:
Jingwen Chen
2020-11-10 02:57:28 +00:00
committed by Automerger Merge Worker
parent f456f13bfb b05d62f584
commit f246c08e9e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/queryview.go
View File

@@ -25,7 +25,7 @@ import (
// The Bazel QueryView singleton is responsible for generating the Ninja actions // The Bazel QueryView singleton is responsible for generating the Ninja actions
// for calling the soong_build primary builder in the main build.ninja file. // for calling the soong_build primary builder in the main build.ninja file.
func init() { func init() {
RegisterSingletonType("bazel_queryView", BazelQueryViewSingleton) RegisterSingletonType("bazel_queryview", BazelQueryViewSingleton)
} }
func BazelQueryViewSingleton() Singleton { func BazelQueryViewSingleton() Singleton {
@@ -48,14 +48,16 @@ func (c *bazelQueryViewSingleton) GenerateBuildActions(ctx SingletonContext) {
bazelQueryView := ctx.Rule(pctx, "bazelQueryView", bazelQueryView := ctx.Rule(pctx, "bazelQueryView",
blueprint.RuleParams{ blueprint.RuleParams{
Command: fmt.Sprintf( Command: fmt.Sprintf(
"rm -rf ${outDir}/* && %s --bazel_queryview_dir ${outDir} %s && echo WORKSPACE: `cat %s` > ${outDir}/.queryview-depfile.d", "rm -rf ${outDir}/* && "+
"%s --bazel_queryview_dir ${outDir} %s && "+
"echo WORKSPACE: `cat %s` > ${outDir}/.queryview-depfile.d",
primaryBuilder.String(), primaryBuilder.String(),
strings.Join(os.Args[1:], " "), strings.Join(os.Args[1:], " "),
moduleListFilePath.String(), // Use the contents of Android.bp.list as the depfile. moduleListFilePath.String(), // Use the contents of Android.bp.list as the depfile.
), ),
CommandDeps: []string{primaryBuilder.String()}, CommandDeps: []string{primaryBuilder.String()},
Description: fmt.Sprintf( Description: fmt.Sprintf(
"Creating the Bazel QueryView workspace with %s at $outDir", "[EXPERIMENTAL] Creating the Bazel QueryView workspace with %s at $outDir",
primaryBuilder.Base()), primaryBuilder.Base()),
Deps: blueprint.DepsGCC, Deps: blueprint.DepsGCC,
Depfile: "${outDir}/.queryview-depfile.d", Depfile: "${outDir}/.queryview-depfile.d",