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 (
|
|
|
|
"fmt"
|
|
|
|
"path/filepath"
|
|
|
|
"strings"
|
|
|
|
)
|
|
|
|
|
|
|
|
// 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.
|
|
|
|
//
|
|
|
|
// extra_targets adds real arguments to the make command, in case other targets
|
|
|
|
// actually need to be run (like the Soong config generator).
|
|
|
|
//
|
|
|
|
// vars is the list of variables to read. The values will be put in the
|
|
|
|
// returned map.
|
|
|
|
func DumpMakeVars(ctx Context, config Config, goals, extra_targets, vars []string) (map[string]string, error) {
|
2016-08-22 00:17:17 +02:00
|
|
|
ctx.BeginTrace("dumpvars")
|
|
|
|
defer ctx.EndTrace()
|
|
|
|
|
2017-05-04 02:15:47 +02:00
|
|
|
cmd := Command(ctx, config, "make",
|
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
|
|
|
"make",
|
|
|
|
"--no-print-directory",
|
|
|
|
"-f", "build/core/config.mk",
|
|
|
|
"dump-many-vars",
|
|
|
|
"CALLED_FROM_SETUP=true",
|
|
|
|
"BUILD_SYSTEM=build/core",
|
|
|
|
"MAKECMDGOALS="+strings.Join(goals, " "),
|
|
|
|
"DUMP_MANY_VARS="+strings.Join(vars, " "),
|
|
|
|
"OUT_DIR="+config.OutDir())
|
|
|
|
cmd.Args = append(cmd.Args, extra_targets...)
|
2017-05-04 02:15:47 +02:00
|
|
|
cmd.Sandbox = makeSandbox
|
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
|
|
|
// TODO: error out when Stderr contains any content
|
|
|
|
cmd.Stderr = ctx.Stderr()
|
|
|
|
output, err := cmd.Output()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
ret := make(map[string]string, len(vars))
|
|
|
|
for _, line := range strings.Split(string(output), "\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
|
|
|
|
}
|
|
|
|
|
|
|
|
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-* arguments
|
|
|
|
"TARGET_PRODUCT",
|
|
|
|
|
|
|
|
// compiler wrappers set up by make
|
|
|
|
"CC_WRAPPER",
|
|
|
|
"CXX_WRAPPER",
|
2017-04-05 04:05:31 +02:00
|
|
|
"JAVAC_WRAPPER",
|
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
|
|
|
|
|
|
|
// ccache settings
|
|
|
|
"CCACHE_COMPILERCHECK",
|
|
|
|
"CCACHE_SLOPPINESS",
|
|
|
|
"CCACHE_BASEDIR",
|
|
|
|
"CCACHE_CPP2",
|
|
|
|
}
|
|
|
|
|
|
|
|
// Variables to print out in the top banner
|
|
|
|
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",
|
|
|
|
}
|
|
|
|
|
|
|
|
allVars := append(append([]string{
|
|
|
|
// Used to execute Kati and Ninja
|
|
|
|
"NINJA_GOALS",
|
|
|
|
"KATI_GOALS",
|
|
|
|
}, exportEnvVars...), bannerVars...)
|
|
|
|
|
|
|
|
make_vars, err := DumpMakeVars(ctx, config, config.Arguments(), []string{
|
|
|
|
filepath.Join(config.SoongOutDir(), "soong.variables"),
|
|
|
|
}, allVars)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Fatalln("Error dumping make vars:", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Print the banner like make does
|
|
|
|
fmt.Fprintln(ctx.Stdout(), "============================================")
|
|
|
|
for _, name := range bannerVars {
|
|
|
|
if make_vars[name] != "" {
|
|
|
|
fmt.Fprintf(ctx.Stdout(), "%s=%s\n", name, make_vars[name])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fmt.Fprintln(ctx.Stdout(), "============================================")
|
|
|
|
|
|
|
|
// 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"]))
|
|
|
|
}
|