2cec8df3a8
Reverts commit 827aead340
The change being reverted is the result of misunderstanding of how the
status system works. It has to be reverted because it would suppress
_all_ error messages from Make. Achieving what this change purports is
is more involved and requires changing the code to separate progress message
stream from application output stream.
Test: run failing build with ANDROID_QUIET_BUILD=tree and observe errors being output
Change-Id: If9148a7fa773ae32fb0870a448e9470560e53900
37 lines
1.2 KiB
Go
37 lines
1.2 KiB
Go
// Copyright 2018 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 terminal
|
|
|
|
import (
|
|
"io"
|
|
|
|
"android/soong/ui/status"
|
|
)
|
|
|
|
// NewStatusOutput returns a StatusOutput that represents the
|
|
// current build status similarly to Ninja's built-in terminal
|
|
// output.
|
|
//
|
|
// statusFormat takes nearly all the same options as NINJA_STATUS.
|
|
// %c is currently unsupported.
|
|
func NewStatusOutput(w io.Writer, statusFormat string, forceSimpleOutput, quietBuild, forceKeepANSI bool) status.StatusOutput {
|
|
formatter := newFormatter(statusFormat, quietBuild)
|
|
|
|
if !forceSimpleOutput && isSmartTerminal(w) {
|
|
return NewSmartStatusOutput(w, formatter)
|
|
} else {
|
|
return NewSimpleStatusOutput(w, formatter, forceKeepANSI)
|
|
}
|
|
}
|