am aaa9d8dc: Merge "Fix windows build"

* commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f':
  Fix windows build
This commit is contained in:
Colin Cross
2015-09-26 00:15:44 +00:00
committed by Android Git Automerger

View File

@@ -123,7 +123,10 @@ 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
# Use host and target GLOBAL_CFLAGS so it doesn't apply to HOST_CROSS, the windows
# toolchain is still 4.8 and doesn't support color.
HOST_GLOBAL_CFLAGS += -fdiagnostics-color
TARGET_GLOBAL_CFLAGS += -fdiagnostics-color
COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
COMMON_RELEASE_CPPFLAGS:=