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
200 lines
5.4 KiB
Go
200 lines
5.4 KiB
Go
// 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 (
|
|
"bytes"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"android/soong/ui/status"
|
|
)
|
|
|
|
// DumpMakeVars can be used to extract the values of Make variables after the
|
|
// product configurations are loaded. This is roughly equivalent to the
|
|
// `get_build_var` bash function.
|
|
//
|
|
// goals can be used to set MAKECMDGOALS, which emulates passing arguments to
|
|
// Make without actually building them. So all the variables based on
|
|
// MAKECMDGOALS can be read.
|
|
//
|
|
// vars is the list of variables to read. The values will be put in the
|
|
// returned map.
|
|
func DumpMakeVars(ctx Context, config Config, goals, vars []string) (map[string]string, error) {
|
|
return dumpMakeVars(ctx, config, goals, vars, false)
|
|
}
|
|
|
|
func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_vars bool) (map[string]string, error) {
|
|
ctx.BeginTrace("dumpvars")
|
|
defer ctx.EndTrace()
|
|
|
|
cmd := Command(ctx, config, "dumpvars",
|
|
config.PrebuiltBuildTool("ckati"),
|
|
"-f", "build/make/core/config.mk",
|
|
"--color_warnings",
|
|
"--kati_stats",
|
|
"dump-many-vars",
|
|
"MAKECMDGOALS="+strings.Join(goals, " "))
|
|
cmd.Environment.Set("CALLED_FROM_SETUP", "true")
|
|
cmd.Environment.Set("BUILD_SYSTEM", "build/make/core")
|
|
if write_soong_vars {
|
|
cmd.Environment.Set("WRITE_SOONG_VARIABLES", "true")
|
|
}
|
|
cmd.Environment.Set("DUMP_MANY_VARS", strings.Join(vars, " "))
|
|
cmd.Sandbox = dumpvarsSandbox
|
|
output := bytes.Buffer{}
|
|
cmd.Stdout = &output
|
|
pipe, err := cmd.StderrPipe()
|
|
if err != nil {
|
|
ctx.Fatalln("Error getting output pipe for ckati:", err)
|
|
}
|
|
cmd.StartOrFatal()
|
|
// TODO: error out when Stderr contains any content
|
|
status.KatiReader(ctx.Status.StartTool(), pipe)
|
|
cmd.WaitOrFatal()
|
|
|
|
ret := make(map[string]string, len(vars))
|
|
for _, line := range strings.Split(output.String(), "\n") {
|
|
if len(line) == 0 {
|
|
continue
|
|
}
|
|
|
|
if key, value, ok := decodeKeyValue(line); ok {
|
|
if value, ok = singleUnquote(value); ok {
|
|
ret[key] = value
|
|
ctx.Verboseln(key, value)
|
|
} else {
|
|
return nil, fmt.Errorf("Failed to parse make line: %q", line)
|
|
}
|
|
} else {
|
|
return nil, fmt.Errorf("Failed to parse make line: %q", line)
|
|
}
|
|
}
|
|
|
|
return ret, nil
|
|
}
|
|
|
|
// Variables to print out in the top banner
|
|
var BannerVars = []string{
|
|
"PLATFORM_VERSION_CODENAME",
|
|
"PLATFORM_VERSION",
|
|
"TARGET_PRODUCT",
|
|
"TARGET_BUILD_VARIANT",
|
|
"TARGET_BUILD_TYPE",
|
|
"TARGET_BUILD_APPS",
|
|
"TARGET_ARCH",
|
|
"TARGET_ARCH_VARIANT",
|
|
"TARGET_CPU_VARIANT",
|
|
"TARGET_2ND_ARCH",
|
|
"TARGET_2ND_ARCH_VARIANT",
|
|
"TARGET_2ND_CPU_VARIANT",
|
|
"HOST_ARCH",
|
|
"HOST_2ND_ARCH",
|
|
"HOST_OS",
|
|
"HOST_OS_EXTRA",
|
|
"HOST_CROSS_OS",
|
|
"HOST_CROSS_ARCH",
|
|
"HOST_CROSS_2ND_ARCH",
|
|
"HOST_BUILD_TYPE",
|
|
"BUILD_ID",
|
|
"OUT_DIR",
|
|
"AUX_OS_VARIANT_LIST",
|
|
"TARGET_BUILD_PDK",
|
|
"PDK_FUSION_PLATFORM_ZIP",
|
|
"PRODUCT_SOONG_NAMESPACES",
|
|
}
|
|
|
|
func Banner(make_vars map[string]string) string {
|
|
b := &bytes.Buffer{}
|
|
|
|
fmt.Fprintln(b, "============================================")
|
|
for _, name := range BannerVars {
|
|
if make_vars[name] != "" {
|
|
fmt.Fprintf(b, "%s=%s\n", name, make_vars[name])
|
|
}
|
|
}
|
|
fmt.Fprint(b, "============================================")
|
|
|
|
return b.String()
|
|
}
|
|
|
|
func runMakeProductConfig(ctx Context, config Config) {
|
|
// Variables to export into the environment of Kati/Ninja
|
|
exportEnvVars := []string{
|
|
// So that we can use the correct TARGET_PRODUCT if it's been
|
|
// modified by PRODUCT-*/APP-* arguments
|
|
"TARGET_PRODUCT",
|
|
"TARGET_BUILD_VARIANT",
|
|
"TARGET_BUILD_APPS",
|
|
|
|
// compiler wrappers set up by make
|
|
"CC_WRAPPER",
|
|
"CXX_WRAPPER",
|
|
"JAVAC_WRAPPER",
|
|
|
|
// ccache settings
|
|
"CCACHE_COMPILERCHECK",
|
|
"CCACHE_SLOPPINESS",
|
|
"CCACHE_BASEDIR",
|
|
"CCACHE_CPP2",
|
|
}
|
|
|
|
allVars := append(append([]string{
|
|
// Used to execute Kati and Ninja
|
|
"NINJA_GOALS",
|
|
"KATI_GOALS",
|
|
|
|
// To find target/product/<DEVICE>
|
|
"TARGET_DEVICE",
|
|
|
|
// So that later Kati runs can find BoardConfig.mk faster
|
|
"TARGET_DEVICE_DIR",
|
|
|
|
// Whether --werror_overriding_commands will work
|
|
"BUILD_BROKEN_DUP_RULES",
|
|
|
|
// Not used, but useful to be in the soong.log
|
|
"BUILD_BROKEN_ANDROIDMK_EXPORTS",
|
|
"BUILD_BROKEN_DUP_COPY_HEADERS",
|
|
"BUILD_BROKEN_PHONY_TARGETS",
|
|
}, exportEnvVars...), BannerVars...)
|
|
|
|
make_vars, err := dumpMakeVars(ctx, config, config.Arguments(), allVars, true)
|
|
if err != nil {
|
|
ctx.Fatalln("Error dumping make vars:", err)
|
|
}
|
|
|
|
// Print the banner like make does
|
|
ctx.Writer.Print(Banner(make_vars))
|
|
|
|
// Populate the environment
|
|
env := config.Environment()
|
|
for _, name := range exportEnvVars {
|
|
if make_vars[name] == "" {
|
|
env.Unset(name)
|
|
} else {
|
|
env.Set(name, make_vars[name])
|
|
}
|
|
}
|
|
|
|
config.SetKatiArgs(strings.Fields(make_vars["KATI_GOALS"]))
|
|
config.SetNinjaArgs(strings.Fields(make_vars["NINJA_GOALS"]))
|
|
config.SetTargetDevice(make_vars["TARGET_DEVICE"])
|
|
config.SetTargetDeviceDir(make_vars["TARGET_DEVICE_DIR"])
|
|
|
|
config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true")
|
|
config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] != "false")
|
|
}
|