Invoke queryview from the bootstrap Ninja file. (3a82169a) · Commits · e / os / android_build_soong

android/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ bootstrap_go_package {
		"prebuilt.go",
		"prebuilt_build_tool.go",
		"proto.go",
		"queryview.go",
		"register.go",
		"rule_builder.go",
		"sandbox.go",

android/queryview.go

deleted100644 → 0

+0 −112

Original line number	Diff line number	Diff line
		// Copyright 2020 Google Inc. All rights reserved.
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package android

		import (
		"fmt"
		"os"
		"strings"

		"github.com/google/blueprint"
		)

		// The Bazel QueryView singleton is responsible for generating the Ninja actions
		// for calling the soong_build primary builder in the main build.ninja file.
		func init() {
		RegisterSingletonType("bazel_queryview", BazelQueryViewSingleton)
		}

		// BazelQueryViewSingleton is the singleton responsible for registering the
		// soong_build build statement that will convert the Soong module graph after
		// applying all mutators, enabing the feature to query the final state of the
		// Soong graph. This mode is meant for querying the build graph state, and not meant
		// for generating BUILD files to be checked in.
		func BazelQueryViewSingleton() Singleton {
		return &bazelQueryViewSingleton{}
		}

		// BazelConverterSingleton is the singleton responsible for registering the soong_build
		// build statement that will convert the Soong module graph by applying an alternate
		// pipeline of mutators, with the goal of reaching semantic equivalence between the original
		// Blueprint and final BUILD files. Using this mode, the goal is to be able to
		// build with these BUILD files directly in the source tree.
		func BazelConverterSingleton() Singleton {
		return &bazelConverterSingleton{}
		}

		type bazelQueryViewSingleton struct{}
		type bazelConverterSingleton struct{}

		func generateBuildActionsForBazelConversion(ctx SingletonContext, converterMode bool) {
		name := "queryview"
		descriptionTemplate := "[EXPERIMENTAL, PRE-PRODUCTION] Creating the Bazel QueryView workspace with %s at $outDir"

		// Create a build and rule statement, using the Bazel QueryView's WORKSPACE
		// file as the output file marker.
		var deps Paths
		moduleListFilePath := pathForBuildToolDep(ctx, ctx.Config().moduleListFile)
		deps = append(deps, moduleListFilePath)
		deps = append(deps, pathForBuildToolDep(ctx, ctx.Config().ProductVariablesFileName))

		bazelQueryViewDirectory := PathForOutput(ctx, name)
		bazelQueryViewWorkspaceFile := bazelQueryViewDirectory.Join(ctx, "WORKSPACE")
		primaryBuilder := primaryBuilderPath(ctx)
		bazelQueryView := ctx.Rule(pctx, "bazelQueryView",
		blueprint.RuleParams{
		Command: fmt.Sprintf(
		`rm -rf "${outDir}/"* && `+
		`mkdir -p "${outDir}" && `+
		`echo WORKSPACE: $$(cat "%s") > "${outDir}/.queryview-depfile.d" && `+
		`BUILDER="%s" && `+
		`echo BUILDER=$$BUILDER && `+
		`cd "$$(dirname "$$BUILDER")" && `+
		`echo PWD=$$PWD && `+
		`ABSBUILDER="$$PWD/$$(basename "$$BUILDER")" && `+
		`echo ABSBUILDER=$$ABSBUILDER && `+
		`cd / && `+
		`env -i "$$ABSBUILDER" --bazel_queryview_dir "${outDir}" "%s"`,
		moduleListFilePath.String(), // Use the contents of Android.bp.list as the depfile.
		primaryBuilder.String(),
		strings.Join(os.Args[1:], "\" \""),
		),
		CommandDeps: []string{primaryBuilder.String()},
		Description: fmt.Sprintf(
		descriptionTemplate,
		primaryBuilder.Base()),
		Deps: blueprint.DepsGCC,
		Depfile: "${outDir}/.queryview-depfile.d",
		},
		"outDir")

		ctx.Build(pctx, BuildParams{
		Rule: bazelQueryView,
		Output: bazelQueryViewWorkspaceFile,
		Inputs: deps,
		Args: map[string]string{
		"outDir": bazelQueryViewDirectory.String(),
		},
		})

		// Add a phony target for generating the workspace
		ctx.Phony(name, bazelQueryViewWorkspaceFile)
		}

		func (c *bazelQueryViewSingleton) GenerateBuildActions(ctx SingletonContext) {
		generateBuildActionsForBazelConversion(ctx, false)
		}

		func (c *bazelConverterSingleton) GenerateBuildActions(ctx SingletonContext) {
		generateBuildActionsForBazelConversion(ctx, true)
		}

cmd/soong_build/main.go

+8 −4

Original line number	Diff line number	Diff line
		@@ -156,13 +156,15 @@ func runMixedModeBuild(configuration android.Config, firstCtx *android.Context,
		}

		// Run the code-generation phase to convert BazelTargetModules to BUILD files.
		func runQueryView(configuration android.Config, ctx *android.Context) {
		func runQueryView(queryviewDir, queryviewMarker string, configuration android.Config, ctx *android.Context) {
		codegenContext := bp2build.NewCodegenContext(configuration, *ctx, bp2build.QueryView)
		absoluteQueryViewDir := shared.JoinPath(topDir, bazelQueryViewDir)
		absoluteQueryViewDir := shared.JoinPath(topDir, queryviewDir)
		if err := createBazelQueryView(codegenContext, absoluteQueryViewDir); err != nil {
		fmt.Fprintf(os.Stderr, "%s", err)
		os.Exit(1)
		}

		touch(shared.JoinPath(topDir, queryviewMarker))
		}

		func runSoongDocs(configuration android.Config) {
		@@ -244,8 +246,10 @@ func doChosenActivity(configuration android.Config, extraNinjaDeps []string) str

		// Convert the Soong module graph into Bazel BUILD files.
		if generateQueryView {
		runQueryView(configuration, ctx)
		return cmdlineArgs.OutFile // TODO: This is a lie
		queryviewMarkerFile := bazelQueryViewDir + ".marker"
		runQueryView(bazelQueryViewDir, queryviewMarkerFile, configuration, ctx)
		writeDepFile(queryviewMarkerFile, ninjaDeps)
		return queryviewMarkerFile
		} else if moduleGraphFile != "" {
		writeJsonModuleGraph(ctx, moduleGraphFile)
		writeDepFile(moduleGraphFile, ninjaDeps)

tests/bootstrap_test.sh

+24 −0

Original line number	Diff line number	Diff line
		@@ -785,6 +785,28 @@ function test_bp2build_back_and_forth_null_build {
		fi
		}

		function test_queryview_smoke() {
		setup

		run_soong queryview
		[[ -e out/soong/queryview/WORKSPACE ]] \|\| fail "queryview WORKSPACE file not created"

		}

		function test_queryview_null_build() {
		setup

		run_soong queryview
		local output_mtime1=$(stat -c "%y" out/soong/queryview.marker)

		run_soong queryview
		local output_mtime2=$(stat -c "%y" out/soong/queryview.marker)

		if [[ "$output_mtime1" != "$output_mtime2" ]]; then
		fail "Queryview marker file changed on null build"
		fi
		}

		test_smoke
		test_null_build
		test_null_build_after_docs
		@@ -801,6 +823,8 @@ test_multiple_soong_build_modes
		test_dump_json_module_graph
		test_json_module_graph_back_and_forth_null_build
		test_write_to_source_tree
		test_queryview_smoke
		test_queryview_null_build
		test_bp2build_smoke
		test_bp2build_generates_marker_file
		test_bp2build_null_build

ui/build/config.go

+12 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ type configImpl struct {
		dist bool
		jsonModuleGraph bool
		bp2build bool
		queryview bool
		skipConfig bool
		skipKati bool
		skipKatiNinja bool
		@@ -643,6 +644,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) {
		c.jsonModuleGraph = true
		} else if arg == "bp2build" {
		c.bp2build = true
		} else if arg == "queryview" {
		c.queryview = true
		} else {
		if arg == "checkbuild" {
		c.checkbuild = true
		@@ -720,7 +723,7 @@ func (c *configImpl) SoongBuildInvocationNeeded() bool {
		return true
		}

		if !c.JsonModuleGraph() && !c.Bp2Build() {
		if !c.JsonModuleGraph() && !c.Bp2Build() && !c.Queryview() {
		// Command line was empty, the default Ninja target is built
		return true
		}
		@@ -785,6 +788,10 @@ func (c *configImpl) Bp2BuildMarkerFile() string {
		return shared.JoinPath(c.SoongOutDir(), ".bootstrap/bp2build_workspace_marker")
		}

		func (c *configImpl) QueryviewMarkerFile() string {
		return shared.JoinPath(c.SoongOutDir(), "queryview.marker")
		}

		func (c *configImpl) ModuleGraphFile() string {
		return shared.JoinPath(c.SoongOutDir(), "module-graph.json")
		}
		@@ -822,6 +829,10 @@ func (c *configImpl) Bp2Build() bool {
		return c.bp2build
		}

		func (c *configImpl) Queryview() bool {
		return c.queryview
		}

		func (c *configImpl) IsVerbose() bool {
		return c.verbose
		}