Merge "Fix symlinks from APEX to partitions"
diff --git a/cc/config/global.go b/cc/config/global.go
index 488af45..05dc773 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -193,7 +193,6 @@
noOverrideGlobalCflags = []string{
"-Werror=bool-operation",
- "-Werror=format-insufficient-args",
"-Werror=implicit-int-float-conversion",
"-Werror=int-in-bool-context",
"-Werror=int-to-pointer-cast",
@@ -248,8 +247,6 @@
noOverride64GlobalCflags = []string{}
noOverrideExternalGlobalCflags = []string{
- // http://b/191699019
- "-Wno-format-insufficient-args",
"-Wno-sizeof-array-div",
"-Wno-unused-but-set-variable",
"-Wno-unused-but-set-parameter",
@@ -287,6 +284,9 @@
// http://b/239661264
"-Wno-deprecated-non-prototype",
+
+ // http://b/191699019
+ "-Wno-format-insufficient-args",
}
llvmNextExtraCommonGlobalCflags = []string{
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go
index 0115f4a..0212075 100644
--- a/cmd/multiproduct_kati/main.go
+++ b/cmd/multiproduct_kati/main.go
@@ -515,7 +515,8 @@
"TARGET_BUILD_VARIANT="+*buildVariant,
"TARGET_BUILD_TYPE=release",
"TARGET_BUILD_APPS=",
- "TARGET_BUILD_UNBUNDLED=")
+ "TARGET_BUILD_UNBUNDLED=",
+ "USE_RBE=false") // Disabling RBE saves ~10 secs per product
if *alternateResultDir {
cmd.Env = append(cmd.Env,
diff --git a/ui/build/config.go b/ui/build/config.go
index cb7fe1e..73e2c45 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -369,6 +369,7 @@
"CDPATH",
"DISPLAY",
"GREP_OPTIONS",
+ "JAVAC",
"NDK_ROOT",
"POSIXLY_CORRECT",
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index 1e3e547..a9c298f 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -84,6 +84,14 @@
ctx.BeginTrace(metrics.RunKati, "dumpvars")
defer ctx.EndTrace()
+ tool := ctx.Status.StartTool()
+ if write_soong_vars {
+ // only print this when write_soong_vars is true so that it's not printed when using
+ // the get_build_var command.
+ tool.Status("Running product configuration...")
+ }
+ defer tool.Finish()
+
cmd := Command(ctx, config, "dumpvars",
config.PrebuiltBuildTool("ckati"),
"-f", "build/make/core/config.mk",
@@ -108,7 +116,7 @@
}
cmd.StartOrFatal()
// TODO: error out when Stderr contains any content
- status.KatiReader(ctx.Status.StartTool(), pipe)
+ status.KatiReader(tool, pipe)
cmd.WaitOrFatal()
ret := make(map[string]string, len(vars))
diff --git a/ui/build/rbe.go b/ui/build/rbe.go
index 3c844c1..1d17216 100644
--- a/ui/build/rbe.go
+++ b/ui/build/rbe.go
@@ -100,6 +100,8 @@
ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap")
defer ctx.EndTrace()
+ ctx.Status.Status("Starting rbe...")
+
if u := ulimitOrFatal(ctx, config, "-u"); u < rbeLeastNProcs {
ctx.Fatalf("max user processes is insufficient: %d; want >= %d.\n", u, rbeLeastNProcs)
}
@@ -180,6 +182,8 @@
return
}
+ ctx.Status.Status("Dumping rbe metrics...")
+
outputDir := config.rbeProxyLogsDir()
if outputDir == "" {
ctx.Fatal("RBE output dir variable not defined. Aborting metrics dumping.")