Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
// Copyright 2017 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 build
|
|
|
|
|
|
|
|
import (
|
2020-02-10 20:23:49 +01:00
|
|
|
"io/ioutil"
|
2017-08-05 01:04:04 +02:00
|
|
|
"os"
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
"path/filepath"
|
2017-08-05 01:04:04 +02:00
|
|
|
"strconv"
|
2016-08-22 00:17:17 +02:00
|
|
|
|
2021-02-25 14:44:14 +01:00
|
|
|
"android/soong/shared"
|
2021-04-14 13:49:50 +02:00
|
|
|
"github.com/google/blueprint/deptools"
|
2021-02-26 14:27:36 +01:00
|
|
|
|
2020-02-10 20:23:49 +01:00
|
|
|
soong_metrics_proto "android/soong/ui/metrics/metrics_proto"
|
2021-03-16 08:55:23 +01:00
|
|
|
"github.com/google/blueprint"
|
|
|
|
"github.com/google/blueprint/bootstrap"
|
2020-02-10 20:23:49 +01:00
|
|
|
|
|
|
|
"github.com/golang/protobuf/proto"
|
2017-08-05 01:04:04 +02:00
|
|
|
"github.com/google/blueprint/microfactory"
|
Add a unified status reporting UI
This adds a new status package that merges the running of "actions"
(ninja calls them edges) of multiple tools into one view of the current
state, and gives that to a number of different outputs.
For inputs:
Kati's output parser has been rewritten (and moved) to map onto the
StartAction/FinishAction API. A byproduct of this is that the build
servers should be able to extract errors from Kati better, since they
look like the errors that Ninja used to write.
Ninja is no longer directly connected to the terminal, but its output is
read via the protobuf frontend API, so it's just another tool whose
output becomes merged together.
multiproduct_kati loses its custom status routines, and uses the common
one instead.
For outputs:
The primary output is the ui/terminal.Status type, which along with
ui/terminal.Writer now controls everything about the terminal output.
Today, this doesn't really change any behaviors, but having all terminal
output going through here allows a more complicated (multi-line / full
window) status display in the future.
The tracer acts as an output of the status package, tracing all the
action start / finish events. This replaces reading the .ninja_log file,
so it now properly handles multiple output files from a single action.
A new rotated log file (out/error.log, or out/dist/logs/error.log) just
contains a description of all of the errors that happened during the
current build.
Another new compressed and rotated log file (out/verbose.log.gz, or
out/dist/logs/verbose.log.gz) contains the full verbose (showcommands)
log of every execution run by the build. Since this is now written on
every build, the showcommands argument is now ignored -- if you want to
get the commands run, look at the log file after the build.
Test: m
Test: <built-in tests>
Test: NINJA_ARGS="-t list" m
Test: check the build.trace.gz
Test: check the new log files
Change-Id: If1d8994890d43ef68f65aa10ddd8e6e06dc7013a
2018-05-18 01:37:09 +02:00
|
|
|
|
2018-12-13 01:01:49 +01:00
|
|
|
"android/soong/ui/metrics"
|
Add a unified status reporting UI
This adds a new status package that merges the running of "actions"
(ninja calls them edges) of multiple tools into one view of the current
state, and gives that to a number of different outputs.
For inputs:
Kati's output parser has been rewritten (and moved) to map onto the
StartAction/FinishAction API. A byproduct of this is that the build
servers should be able to extract errors from Kati better, since they
look like the errors that Ninja used to write.
Ninja is no longer directly connected to the terminal, but its output is
read via the protobuf frontend API, so it's just another tool whose
output becomes merged together.
multiproduct_kati loses its custom status routines, and uses the common
one instead.
For outputs:
The primary output is the ui/terminal.Status type, which along with
ui/terminal.Writer now controls everything about the terminal output.
Today, this doesn't really change any behaviors, but having all terminal
output going through here allows a more complicated (multi-line / full
window) status display in the future.
The tracer acts as an output of the status package, tracing all the
action start / finish events. This replaces reading the .ninja_log file,
so it now properly handles multiple output files from a single action.
A new rotated log file (out/error.log, or out/dist/logs/error.log) just
contains a description of all of the errors that happened during the
current build.
Another new compressed and rotated log file (out/verbose.log.gz, or
out/dist/logs/verbose.log.gz) contains the full verbose (showcommands)
log of every execution run by the build. Since this is now written on
every build, the showcommands argument is now ignored -- if you want to
get the commands run, look at the log file after the build.
Test: m
Test: <built-in tests>
Test: NINJA_ARGS="-t list" m
Test: check the build.trace.gz
Test: check the new log files
Change-Id: If1d8994890d43ef68f65aa10ddd8e6e06dc7013a
2018-05-18 01:37:09 +02:00
|
|
|
"android/soong/ui/status"
|
2017-08-05 01:04:04 +02:00
|
|
|
)
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
const (
|
|
|
|
availableEnvFile = "soong.environment.available"
|
|
|
|
usedEnvFile = "soong.environment.used"
|
|
|
|
)
|
|
|
|
|
2021-02-26 14:27:36 +01:00
|
|
|
func writeEnvironmentFile(ctx Context, envFile string, envDeps map[string]string) error {
|
|
|
|
data, err := shared.EnvFileContents(envDeps)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
return ioutil.WriteFile(envFile, data, 0644)
|
|
|
|
}
|
|
|
|
|
2020-11-25 11:19:29 +01:00
|
|
|
// This uses Android.bp files and various tools to generate <builddir>/build.ninja.
|
|
|
|
//
|
2021-03-16 08:55:23 +01:00
|
|
|
// However, the execution of <builddir>/build.ninja happens later in
|
|
|
|
// build/soong/ui/build/build.go#Build()
|
2020-11-25 11:19:29 +01:00
|
|
|
//
|
2021-03-16 08:55:23 +01:00
|
|
|
// We want to rely on as few prebuilts as possible, so we need to bootstrap
|
|
|
|
// Soong. The process is as follows:
|
2020-11-25 11:19:29 +01:00
|
|
|
//
|
2021-03-16 08:55:23 +01:00
|
|
|
// 1. We use "Microfactory", a simple tool to compile Go code, to build
|
|
|
|
// first itself, then soong_ui from soong_ui.bash. This binary contains
|
|
|
|
// parts of soong_build that are needed to build itself.
|
|
|
|
// 2. This simplified version of soong_build then reads the Blueprint files
|
|
|
|
// that describe itself and emits .bootstrap/build.ninja that describes
|
|
|
|
// how to build its full version and use that to produce the final Ninja
|
|
|
|
// file Soong emits.
|
|
|
|
// 3. soong_ui executes .bootstrap/build.ninja
|
2020-11-25 11:19:29 +01:00
|
|
|
//
|
2021-03-16 08:55:23 +01:00
|
|
|
// (After this, Kati is executed to parse the Makefiles, but that's not part of
|
|
|
|
// bootstrapping Soong)
|
|
|
|
|
|
|
|
// A tiny struct used to tell Blueprint that it's in bootstrap mode. It would
|
|
|
|
// probably be nicer to use a flag in bootstrap.Args instead.
|
|
|
|
type BlueprintConfig struct {
|
2021-03-17 15:03:14 +01:00
|
|
|
srcDir string
|
|
|
|
buildDir string
|
|
|
|
ninjaBuildDir string
|
|
|
|
debugCompilation bool
|
2021-03-16 08:55:23 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (c BlueprintConfig) SrcDir() string {
|
|
|
|
return "."
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c BlueprintConfig) BuildDir() string {
|
|
|
|
return c.buildDir
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c BlueprintConfig) NinjaBuildDir() string {
|
|
|
|
return c.ninjaBuildDir
|
|
|
|
}
|
|
|
|
|
2021-03-17 15:03:14 +01:00
|
|
|
func (c BlueprintConfig) DebugCompilation() bool {
|
|
|
|
return c.debugCompilation
|
|
|
|
}
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
func environmentArgs(config Config, suffix string) []string {
|
|
|
|
return []string{
|
|
|
|
"--available_env", shared.JoinPath(config.SoongOutDir(), availableEnvFile),
|
|
|
|
"--used_env", shared.JoinPath(config.SoongOutDir(), usedEnvFile+suffix),
|
|
|
|
}
|
|
|
|
}
|
2021-06-11 18:48:06 +02:00
|
|
|
|
|
|
|
func writeEmptyGlobFile(ctx Context, path string) {
|
|
|
|
err := os.MkdirAll(filepath.Dir(path), 0777)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("Failed to create parent directories of empty ninja glob file '%s': %s", path, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := os.Stat(path); os.IsNotExist(err) {
|
|
|
|
err = ioutil.WriteFile(path, nil, 0666)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("Failed to create empty ninja glob file '%s': %s", path, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
func bootstrapBlueprint(ctx Context, config Config, integratedBp2Build bool) {
|
2021-03-16 08:55:23 +01:00
|
|
|
ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")
|
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
|
|
|
var args bootstrap.Args
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
mainNinjaFile := shared.JoinPath(config.SoongOutDir(), "build.ninja")
|
|
|
|
bootstrapGlobFile := shared.JoinPath(config.SoongOutDir(), ".bootstrap/build-globs.ninja")
|
2021-06-11 18:48:06 +02:00
|
|
|
// .bootstrap/build.ninja "includes" .bootstrap/build-globs.ninja for incremental builds
|
|
|
|
// generate an empty glob before running any rule in .bootstrap/build.ninja
|
|
|
|
writeEmptyGlobFile(ctx, bootstrapGlobFile)
|
2021-04-14 13:49:50 +02:00
|
|
|
bootstrapDepFile := shared.JoinPath(config.SoongOutDir(), ".bootstrap/build.ninja.d")
|
2021-04-14 10:31:00 +02:00
|
|
|
|
2021-03-16 08:55:23 +01:00
|
|
|
args.RunGoTests = !config.skipSoongTests
|
|
|
|
args.UseValidations = true // Use validations to depend on tests
|
|
|
|
args.BuildDir = config.SoongOutDir()
|
|
|
|
args.NinjaBuildDir = config.OutDir()
|
|
|
|
args.TopFile = "Android.bp"
|
|
|
|
args.ModuleListFile = filepath.Join(config.FileListDir(), "Android.bp.list")
|
|
|
|
args.OutFile = shared.JoinPath(config.SoongOutDir(), ".bootstrap/build.ninja")
|
2021-06-11 18:48:06 +02:00
|
|
|
// The primary builder (aka soong_build) will use bootstrapGlobFile as the globFile to generate build.ninja(.d)
|
|
|
|
// Building soong_build does not require a glob file
|
|
|
|
// Using "" instead of "<soong_build_glob>.ninja" will ensure that an unused glob file is not written to out/soong/.bootstrap during StagePrimary
|
|
|
|
args.GlobFile = ""
|
2021-03-17 14:03:51 +01:00
|
|
|
args.GeneratingPrimaryBuilder = true
|
2021-06-01 20:43:55 +02:00
|
|
|
args.EmptyNinjaFile = config.EmptyNinjaFile()
|
2021-03-16 08:55:23 +01:00
|
|
|
|
2021-04-12 12:07:44 +02:00
|
|
|
args.DelveListen = os.Getenv("SOONG_DELVE")
|
|
|
|
if args.DelveListen != "" {
|
|
|
|
args.DelvePath = shared.ResolveDelveBinary()
|
|
|
|
}
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
commonArgs := bootstrap.PrimaryBuilderExtraFlags(args, bootstrapGlobFile, mainNinjaFile)
|
|
|
|
bp2BuildMarkerFile := shared.JoinPath(config.SoongOutDir(), ".bootstrap/bp2build_workspace_marker")
|
|
|
|
mainSoongBuildInputs := []string{"Android.bp"}
|
|
|
|
|
|
|
|
if integratedBp2Build {
|
|
|
|
mainSoongBuildInputs = append(mainSoongBuildInputs, bp2BuildMarkerFile)
|
|
|
|
}
|
|
|
|
|
|
|
|
soongBuildArgs := make([]string, 0)
|
|
|
|
soongBuildArgs = append(soongBuildArgs, commonArgs...)
|
|
|
|
soongBuildArgs = append(soongBuildArgs, environmentArgs(config, "")...)
|
|
|
|
soongBuildArgs = append(soongBuildArgs, "Android.bp")
|
|
|
|
|
|
|
|
mainSoongBuildInvocation := bootstrap.PrimaryBuilderInvocation{
|
|
|
|
Inputs: mainSoongBuildInputs,
|
|
|
|
Outputs: []string{mainNinjaFile},
|
|
|
|
Args: soongBuildArgs,
|
|
|
|
}
|
|
|
|
|
|
|
|
if integratedBp2Build {
|
|
|
|
bp2buildArgs := []string{"--bp2build_marker", bp2BuildMarkerFile}
|
|
|
|
bp2buildArgs = append(bp2buildArgs, commonArgs...)
|
|
|
|
bp2buildArgs = append(bp2buildArgs, environmentArgs(config, ".bp2build")...)
|
|
|
|
bp2buildArgs = append(bp2buildArgs, "Android.bp")
|
|
|
|
|
|
|
|
bp2buildInvocation := bootstrap.PrimaryBuilderInvocation{
|
|
|
|
Inputs: []string{"Android.bp"},
|
|
|
|
Outputs: []string{bp2BuildMarkerFile},
|
|
|
|
Args: bp2buildArgs,
|
|
|
|
}
|
2021-05-25 04:40:29 +02:00
|
|
|
args.PrimaryBuilderInvocations = []bootstrap.PrimaryBuilderInvocation{bp2buildInvocation}
|
|
|
|
if config.bazelBuildMode() == mixedBuild {
|
|
|
|
args.PrimaryBuilderInvocations = append(args.PrimaryBuilderInvocations, mainSoongBuildInvocation)
|
2021-04-14 10:31:00 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
args.PrimaryBuilderInvocations = []bootstrap.PrimaryBuilderInvocation{mainSoongBuildInvocation}
|
|
|
|
}
|
|
|
|
|
2021-03-16 08:55:23 +01:00
|
|
|
blueprintCtx := blueprint.NewContext()
|
|
|
|
blueprintCtx.SetIgnoreUnknownModuleTypes(true)
|
|
|
|
blueprintConfig := BlueprintConfig{
|
2021-03-17 15:03:14 +01:00
|
|
|
srcDir: os.Getenv("TOP"),
|
|
|
|
buildDir: config.SoongOutDir(),
|
|
|
|
ninjaBuildDir: config.OutDir(),
|
|
|
|
debugCompilation: os.Getenv("SOONG_DELVE") != "",
|
2021-03-16 08:55:23 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 13:49:50 +02:00
|
|
|
bootstrapDeps := bootstrap.RunBlueprint(args, blueprintCtx, blueprintConfig)
|
|
|
|
err := deptools.WriteDepFile(bootstrapDepFile, args.OutFile, bootstrapDeps)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("Error writing depfile '%s': %s", bootstrapDepFile, err)
|
|
|
|
}
|
2021-03-16 08:55:23 +01:00
|
|
|
}
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
func checkEnvironmentFile(currentEnv *Environment, envFile string) {
|
|
|
|
getenv := func(k string) string {
|
|
|
|
v, _ := currentEnv.Get(k)
|
|
|
|
return v
|
|
|
|
}
|
|
|
|
if stale, _ := shared.StaleEnvFile(envFile, getenv); stale {
|
|
|
|
os.Remove(envFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
func runSoong(ctx Context, config Config) {
|
2018-12-13 01:01:49 +01:00
|
|
|
ctx.BeginTrace(metrics.RunSoong, "soong")
|
2016-08-22 00:17:17 +02:00
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
2021-02-26 14:27:36 +01:00
|
|
|
// We have two environment files: .available is the one with every variable,
|
|
|
|
// .used with the ones that were actually used. The latter is used to
|
|
|
|
// determine whether Soong needs to be re-run since why re-run it if only
|
|
|
|
// unused variables were changed?
|
2021-04-14 10:31:00 +02:00
|
|
|
envFile := filepath.Join(config.SoongOutDir(), availableEnvFile)
|
2021-02-26 14:27:36 +01:00
|
|
|
|
2021-03-16 08:55:23 +01:00
|
|
|
for _, n := range []string{".bootstrap", ".minibootstrap"} {
|
|
|
|
dir := filepath.Join(config.SoongOutDir(), n)
|
|
|
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
|
|
|
ctx.Fatalf("Cannot mkdir " + dir)
|
2020-10-29 22:08:31 +01:00
|
|
|
}
|
2021-03-16 08:55:23 +01:00
|
|
|
}
|
2020-10-29 22:08:31 +01:00
|
|
|
|
2021-04-20 21:32:07 +02:00
|
|
|
buildMode := config.bazelBuildMode()
|
|
|
|
integratedBp2Build := (buildMode == mixedBuild) || (buildMode == generateBuildFiles)
|
2021-04-14 10:31:00 +02:00
|
|
|
|
2021-03-16 08:55:23 +01:00
|
|
|
// This is done unconditionally, but does not take a measurable amount of time
|
2021-04-14 10:31:00 +02:00
|
|
|
bootstrapBlueprint(ctx, config, integratedBp2Build)
|
2017-08-05 01:04:04 +02:00
|
|
|
|
2021-02-26 14:27:36 +01:00
|
|
|
soongBuildEnv := config.Environment().Copy()
|
|
|
|
soongBuildEnv.Set("TOP", os.Getenv("TOP"))
|
|
|
|
// For Bazel mixed builds.
|
|
|
|
soongBuildEnv.Set("BAZEL_PATH", "./tools/bazel")
|
|
|
|
soongBuildEnv.Set("BAZEL_HOME", filepath.Join(config.BazelOutDir(), "bazelhome"))
|
|
|
|
soongBuildEnv.Set("BAZEL_OUTPUT_BASE", filepath.Join(config.BazelOutDir(), "output"))
|
|
|
|
soongBuildEnv.Set("BAZEL_WORKSPACE", absPath(ctx, "."))
|
|
|
|
soongBuildEnv.Set("BAZEL_METRICS_DIR", config.BazelMetricsDir())
|
|
|
|
|
2021-03-16 08:55:23 +01:00
|
|
|
// For Soong bootstrapping tests
|
|
|
|
if os.Getenv("ALLOW_MISSING_DEPENDENCIES") == "true" {
|
|
|
|
soongBuildEnv.Set("ALLOW_MISSING_DEPENDENCIES", "true")
|
|
|
|
}
|
|
|
|
|
2021-03-05 13:26:14 +01:00
|
|
|
err := writeEnvironmentFile(ctx, envFile, soongBuildEnv.AsMap())
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("failed to write environment file %s: %s", envFile, err)
|
|
|
|
}
|
2021-02-26 14:27:36 +01:00
|
|
|
|
2017-08-05 01:04:04 +02:00
|
|
|
func() {
|
2018-12-13 01:01:49 +01:00
|
|
|
ctx.BeginTrace(metrics.RunSoong, "environment check")
|
2017-08-05 01:04:04 +02:00
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
2021-04-14 10:31:00 +02:00
|
|
|
soongBuildEnvFile := filepath.Join(config.SoongOutDir(), usedEnvFile)
|
|
|
|
checkEnvironmentFile(soongBuildEnv, soongBuildEnvFile)
|
|
|
|
|
|
|
|
if integratedBp2Build {
|
|
|
|
bp2buildEnvFile := filepath.Join(config.SoongOutDir(), usedEnvFile+".bp2build")
|
|
|
|
checkEnvironmentFile(soongBuildEnv, bp2buildEnvFile)
|
2017-08-05 01:04:04 +02:00
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2018-07-06 06:46:51 +02:00
|
|
|
var cfg microfactory.Config
|
|
|
|
cfg.Map("github.com/google/blueprint", "build/blueprint")
|
|
|
|
|
|
|
|
cfg.TrimPath = absPath(ctx, ".")
|
|
|
|
|
|
|
|
func() {
|
2018-12-13 01:01:49 +01:00
|
|
|
ctx.BeginTrace(metrics.RunSoong, "bpglob")
|
2018-07-06 06:46:51 +02:00
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
|
|
|
bpglob := filepath.Join(config.SoongOutDir(), ".minibootstrap/bpglob")
|
|
|
|
if _, err := microfactory.Build(&cfg, bpglob, "github.com/google/blueprint/bootstrap/bpglob"); err != nil {
|
|
|
|
ctx.Fatalln("Failed to build bpglob:", err)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2017-08-05 01:04:04 +02:00
|
|
|
ninja := func(name, file string) {
|
2018-12-13 01:01:49 +01:00
|
|
|
ctx.BeginTrace(metrics.RunSoong, name)
|
2017-08-05 01:04:04 +02:00
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
Add a unified status reporting UI
This adds a new status package that merges the running of "actions"
(ninja calls them edges) of multiple tools into one view of the current
state, and gives that to a number of different outputs.
For inputs:
Kati's output parser has been rewritten (and moved) to map onto the
StartAction/FinishAction API. A byproduct of this is that the build
servers should be able to extract errors from Kati better, since they
look like the errors that Ninja used to write.
Ninja is no longer directly connected to the terminal, but its output is
read via the protobuf frontend API, so it's just another tool whose
output becomes merged together.
multiproduct_kati loses its custom status routines, and uses the common
one instead.
For outputs:
The primary output is the ui/terminal.Status type, which along with
ui/terminal.Writer now controls everything about the terminal output.
Today, this doesn't really change any behaviors, but having all terminal
output going through here allows a more complicated (multi-line / full
window) status display in the future.
The tracer acts as an output of the status package, tracing all the
action start / finish events. This replaces reading the .ninja_log file,
so it now properly handles multiple output files from a single action.
A new rotated log file (out/error.log, or out/dist/logs/error.log) just
contains a description of all of the errors that happened during the
current build.
Another new compressed and rotated log file (out/verbose.log.gz, or
out/dist/logs/verbose.log.gz) contains the full verbose (showcommands)
log of every execution run by the build. Since this is now written on
every build, the showcommands argument is now ignored -- if you want to
get the commands run, look at the log file after the build.
Test: m
Test: <built-in tests>
Test: NINJA_ARGS="-t list" m
Test: check the build.trace.gz
Test: check the new log files
Change-Id: If1d8994890d43ef68f65aa10ddd8e6e06dc7013a
2018-05-18 01:37:09 +02:00
|
|
|
fifo := filepath.Join(config.OutDir(), ".ninja_fifo")
|
2019-03-22 00:02:58 +01:00
|
|
|
nr := status.NewNinjaReader(ctx, ctx.Status.StartTool(), fifo)
|
|
|
|
defer nr.Close()
|
Add a unified status reporting UI
This adds a new status package that merges the running of "actions"
(ninja calls them edges) of multiple tools into one view of the current
state, and gives that to a number of different outputs.
For inputs:
Kati's output parser has been rewritten (and moved) to map onto the
StartAction/FinishAction API. A byproduct of this is that the build
servers should be able to extract errors from Kati better, since they
look like the errors that Ninja used to write.
Ninja is no longer directly connected to the terminal, but its output is
read via the protobuf frontend API, so it's just another tool whose
output becomes merged together.
multiproduct_kati loses its custom status routines, and uses the common
one instead.
For outputs:
The primary output is the ui/terminal.Status type, which along with
ui/terminal.Writer now controls everything about the terminal output.
Today, this doesn't really change any behaviors, but having all terminal
output going through here allows a more complicated (multi-line / full
window) status display in the future.
The tracer acts as an output of the status package, tracing all the
action start / finish events. This replaces reading the .ninja_log file,
so it now properly handles multiple output files from a single action.
A new rotated log file (out/error.log, or out/dist/logs/error.log) just
contains a description of all of the errors that happened during the
current build.
Another new compressed and rotated log file (out/verbose.log.gz, or
out/dist/logs/verbose.log.gz) contains the full verbose (showcommands)
log of every execution run by the build. Since this is now written on
every build, the showcommands argument is now ignored -- if you want to
get the commands run, look at the log file after the build.
Test: m
Test: <built-in tests>
Test: NINJA_ARGS="-t list" m
Test: check the build.trace.gz
Test: check the new log files
Change-Id: If1d8994890d43ef68f65aa10ddd8e6e06dc7013a
2018-05-18 01:37:09 +02:00
|
|
|
|
2017-08-05 01:04:04 +02:00
|
|
|
cmd := Command(ctx, config, "soong "+name,
|
|
|
|
config.PrebuiltBuildTool("ninja"),
|
|
|
|
"-d", "keepdepfile",
|
2020-05-18 23:02:02 +02:00
|
|
|
"-d", "stats",
|
2020-04-19 05:25:59 +02:00
|
|
|
"-o", "usesphonyoutputs=yes",
|
|
|
|
"-o", "preremoveoutputs=yes",
|
2017-08-05 01:04:04 +02:00
|
|
|
"-w", "dupbuild=err",
|
2020-04-19 05:25:59 +02:00
|
|
|
"-w", "outputdir=err",
|
|
|
|
"-w", "missingoutfile=err",
|
2017-08-05 01:04:04 +02:00
|
|
|
"-j", strconv.Itoa(config.Parallel()),
|
2018-07-18 02:54:31 +02:00
|
|
|
"--frontend_file", fifo,
|
2017-08-05 01:04:04 +02:00
|
|
|
"-f", filepath.Join(config.SoongOutDir(), file))
|
2020-11-02 08:56:20 +01:00
|
|
|
|
2021-03-09 10:43:57 +01:00
|
|
|
var ninjaEnv Environment
|
2021-03-10 10:48:39 +01:00
|
|
|
|
|
|
|
// This is currently how the command line to invoke soong_build finds the
|
|
|
|
// root of the source tree and the output root
|
2021-03-09 10:43:57 +01:00
|
|
|
ninjaEnv.Set("TOP", os.Getenv("TOP"))
|
2021-03-02 10:09:41 +01:00
|
|
|
|
2021-03-09 10:43:57 +01:00
|
|
|
cmd.Environment = &ninjaEnv
|
2017-08-05 01:04:04 +02:00
|
|
|
cmd.Sandbox = soongSandbox
|
2019-06-19 22:17:59 +02:00
|
|
|
cmd.RunAndStreamOrFatal()
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
}
|
2020-11-25 11:19:29 +01:00
|
|
|
// This build generates <builddir>/build.ninja, which is used later by build/soong/ui/build/build.go#Build().
|
2017-08-05 01:04:04 +02:00
|
|
|
ninja("bootstrap", ".bootstrap/build.ninja")
|
2020-02-10 20:23:49 +01:00
|
|
|
|
2021-01-28 14:22:12 +01:00
|
|
|
var soongBuildMetrics *soong_metrics_proto.SoongBuildMetrics
|
|
|
|
if shouldCollectBuildSoongMetrics(config) {
|
|
|
|
soongBuildMetrics := loadSoongBuildMetrics(ctx, config)
|
|
|
|
logSoongBuildMetrics(ctx, soongBuildMetrics)
|
|
|
|
}
|
2020-02-10 20:23:49 +01:00
|
|
|
|
2020-06-25 20:27:52 +02:00
|
|
|
distGzipFile(ctx, config, config.SoongNinjaFile(), "soong")
|
|
|
|
|
2020-11-27 13:35:20 +01:00
|
|
|
if !config.SkipKati() {
|
2020-06-25 20:27:52 +02:00
|
|
|
distGzipFile(ctx, config, config.SoongAndroidMk(), "soong")
|
|
|
|
distGzipFile(ctx, config, config.SoongMakeVarsMk(), "soong")
|
|
|
|
}
|
|
|
|
|
2021-01-28 14:22:12 +01:00
|
|
|
if shouldCollectBuildSoongMetrics(config) && ctx.Metrics != nil {
|
2020-02-10 20:23:49 +01:00
|
|
|
ctx.Metrics.SetSoongBuildMetrics(soongBuildMetrics)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-28 14:22:12 +01:00
|
|
|
func shouldCollectBuildSoongMetrics(config Config) bool {
|
|
|
|
// Do not collect metrics protobuf if the soong_build binary ran as the bp2build converter.
|
2021-04-20 21:32:07 +02:00
|
|
|
return config.bazelBuildMode() != generateBuildFiles
|
2021-01-28 14:22:12 +01:00
|
|
|
}
|
|
|
|
|
2020-02-10 20:23:49 +01:00
|
|
|
func loadSoongBuildMetrics(ctx Context, config Config) *soong_metrics_proto.SoongBuildMetrics {
|
|
|
|
soongBuildMetricsFile := filepath.Join(config.OutDir(), "soong", "soong_build_metrics.pb")
|
|
|
|
buf, err := ioutil.ReadFile(soongBuildMetricsFile)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("Failed to load %s: %s", soongBuildMetricsFile, err)
|
|
|
|
}
|
|
|
|
soongBuildMetrics := &soong_metrics_proto.SoongBuildMetrics{}
|
|
|
|
err = proto.Unmarshal(buf, soongBuildMetrics)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalf("Failed to unmarshal %s: %s", soongBuildMetricsFile, err)
|
|
|
|
}
|
|
|
|
return soongBuildMetrics
|
|
|
|
}
|
|
|
|
|
|
|
|
func logSoongBuildMetrics(ctx Context, metrics *soong_metrics_proto.SoongBuildMetrics) {
|
|
|
|
ctx.Verbosef("soong_build metrics:")
|
|
|
|
ctx.Verbosef(" modules: %v", metrics.GetModules())
|
|
|
|
ctx.Verbosef(" variants: %v", metrics.GetVariants())
|
|
|
|
ctx.Verbosef(" max heap size: %v MB", metrics.GetMaxHeapSize()/1e6)
|
|
|
|
ctx.Verbosef(" total allocation count: %v", metrics.GetTotalAllocCount())
|
|
|
|
ctx.Verbosef(" total allocation size: %v MB", metrics.GetTotalAllocSize()/1e6)
|
|
|
|
|
Add a Go replacement for our top-level Make wrapper
Right now this mostly just copies what Make is doing in
build/core/ninja.mk and build/core/soong.mk. The only major feature it
adds is a rotating log file with some verbose logging.
There is one major functional difference -- you cannot override random
Make variables during the Make phase anymore. The environment variable
is set, and if Make uses ?= or the equivalent, it can still use those
variables. We already made this change for Kati, which also loads all of
the same code and actually does the build, so it has been half-removed
for a while.
The only "UI" this implements is what I'll call "Make Emulation" mode --
it's expected that current command lines will continue working, and
we'll explore alternate user interfaces later.
We're still using Make as a wrapper, but all it does is call into this
single Go program, it won't even load the product configuration. Once
this is default, we can start moving individual users over to using this
directly (still in Make emulation mode), skipping the Make wrapper.
Ideas for the future:
* Generating trace files showing time spent in Make/Kati/Soong/Ninja
(also importing ninja traces into the same stream). I had this working
in a previous version of this patch, but removed it to keep the size
down and focus on the current features.
* More intelligent SIGALRM handling, once we fully remove the Make
wrapper (which hides the SIGALRM)
* Reading the experimental binary output stream from Ninja, so that we
can always save the verbose log even if we're not printing it out to
the console
Test: USE_SOONG_UI=true m -j blueprint_tools
Change-Id: I884327b9a8ae24499eb6c56f6e1ad26df1cfa4e4
2016-08-22 00:17:17 +02:00
|
|
|
}
|