am 6edd4cca: am ba9bc4d7: am 0d97557d: Merge "Enable color output from gcc and clang"

* commit '6edd4ccad3419c336cb5198b5353390b7a292c82':
  Enable color output from gcc and clang
This commit is contained in:
Colin Cross 2015-09-25 23:28:43 +00:00 committed by Android Git Automerger
commit ad9b8f7ce7
2 changed files with 11 additions and 1 deletions

View File

@ -47,6 +47,11 @@ CLANG_CONFIG_EXTRA_CFLAGS += \
CLANG_CONFIG_EXTRA_CPPFLAGS += \ CLANG_CONFIG_EXTRA_CPPFLAGS += \
-Wno-inconsistent-missing-override -Wno-inconsistent-missing-override
# Force clang to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal.
CLANG_CONFIG_EXTRA_CFLAGS += \
-fcolor-diagnostics
CLANG_CONFIG_UNKNOWN_CFLAGS := \ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-finline-functions \ -finline-functions \
-finline-limit=64 \ -finline-limit=64 \
@ -72,7 +77,8 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \
-Wno-unused-but-set-variable \ -Wno-unused-but-set-variable \
-Wno-unused-local-typedefs \ -Wno-unused-local-typedefs \
-Wunused-but-set-parameter \ -Wunused-but-set-parameter \
-Wunused-but-set-variable -Wunused-but-set-variable \
-fdiagnostics-color
# Clang flags for all host rules # Clang flags for all host rules
CLANG_CONFIG_HOST_EXTRA_ASFLAGS := CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=

View File

@ -126,6 +126,10 @@ hide := $(if $(SHOW_COMMANDS),,@)
COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith COMMON_GLOBAL_CFLAGS:= -DANDROID -fmessage-length=0 -W -Wall -Wno-unused -Winit-self -Wpointer-arith
COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG COMMON_RELEASE_CFLAGS:= -DNDEBUG -UDEBUG
# Force gcc to always output color diagnostics. Ninja will strip the ANSI
# color codes if it is not running in a terminal.
COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
COMMON_RELEASE_CPPFLAGS:= COMMON_RELEASE_CPPFLAGS:=