aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorSasha Smundak2019-01-23 11:52:57 -0600
committerSasha Smundak2019-02-07 14:21:45 -0600
commitc0c9ef996497250493bbe0f45b3ab71b831d071c (patch)
tree4ce2dceaa6e8b62f18f878584c9dcce69b4b58a0 /cmd
parent17c85f098af453781438f9383dbfe1968b8f861f (diff)
downloadplatform-build-soong-c0c9ef996497250493bbe0f45b3ab71b831d071c.tar.gz
platform-build-soong-c0c9ef996497250493bbe0f45b3ab71b831d071c.tar.xz
platform-build-soong-c0c9ef996497250493bbe0f45b3ab71b831d071c.zip
Provide an option to reduce build's verbosity.
If ANDROID_QUIET_BUILD environment variable is set to '1', do not show 20 lines of the environment variables. In addition, for the failing step show only the step name and output, omitting the command proper (the verbose log as well as error.log still contains it). If build succeeds, the output of the build itself consists of a single line: ``` > m androidmk [100% NN/NN] <last command> ``` When it fails, the output does not contain sometimes very long command line: ``` > m androidmk [ 97% NN/MM] test androidmk FAILED: <step> --- FAIL: TestEndToEnd (0.01s) androidmk_test.go:1025: failed testcase 'prebuilt_etc_TARGET_OUT_ETC' input: include $(CLEAR_VARS) LOCAL_MODULE := etc.test1 LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/foo/bar include $(BUILD_PREBUILT) expected: prebuilt_etc { name: "etc.test1", filename: "foo/bar", } got: prebuilt_etc { name: "etc.test1", filename: "foo/bar", } FAIL 17:50:53 ninja failed with: exit status 1 ``` [The related change in build/make/envsetup.sh suppresses timing display when the same variable is set.] Change-Id: I4d3c72457de031ff58a324c2fe98f4c1d10f8239 Test: treehugger
Diffstat (limited to 'cmd')
-rw-r--r--cmd/multiproduct_kati/main.go6
-rw-r--r--cmd/soong_ui/main.go3
2 files changed, 6 insertions, 3 deletions
diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go
index 6a3d579b..330c5dd2 100644
--- a/cmd/multiproduct_kati/main.go
+++ b/cmd/multiproduct_kati/main.go
@@ -172,7 +172,8 @@ func main() {
172 172
173 stat := &status.Status{} 173 stat := &status.Status{}
174 defer stat.Finish() 174 defer stat.Finish()
175 stat.AddOutput(terminal.NewStatusOutput(writer, "")) 175 stat.AddOutput(terminal.NewStatusOutput(writer, "",
176 build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD")))
176 177
177 var failures failureCount 178 var failures failureCount
178 stat.AddOutput(&failures) 179 stat.AddOutput(&failures)
@@ -389,7 +390,8 @@ func buildProduct(mpctx *mpContext, product string) {
389 Thread: mpctx.Tracer.NewThread(product), 390 Thread: mpctx.Tracer.NewThread(product),
390 Status: &status.Status{}, 391 Status: &status.Status{},
391 }} 392 }}
392 ctx.Status.AddOutput(terminal.NewStatusOutput(ctx.Writer, "")) 393 ctx.Status.AddOutput(terminal.NewStatusOutput(ctx.Writer, "",
394 build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD")))
393 395
394 config := build.NewConfig(ctx, flag.Args()...) 396 config := build.NewConfig(ctx, flag.Args()...)
395 config.Environment().Set("OUT_DIR", outDir) 397 config.Environment().Set("OUT_DIR", outDir)
diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go
index 03803689..d6999c57 100644
--- a/cmd/soong_ui/main.go
+++ b/cmd/soong_ui/main.go
@@ -78,7 +78,8 @@ func main() {
78 78
79 stat := &status.Status{} 79 stat := &status.Status{}
80 defer stat.Finish() 80 defer stat.Finish()
81 stat.AddOutput(terminal.NewStatusOutput(writer, os.Getenv("NINJA_STATUS"))) 81 stat.AddOutput(terminal.NewStatusOutput(writer, os.Getenv("NINJA_STATUS"),
82 build.OsEnvironment().IsEnvTrue("ANDROID_QUIET_BUILD")))
82 stat.AddOutput(trace.StatusTracer()) 83 stat.AddOutput(trace.StatusTracer())
83 84
84 build.SetupSignals(log, cancel, func() { 85 build.SetupSignals(log, cancel, func() {