am ffd25c7f: am 84494473: am aaa9d8dc: Merge "Fix windows build"

* commit 'ffd25c7f1445df9d6b8c28ada7b2174c6827ddcf':
  Fix windows build
This commit is contained in:
Colin Cross 2015-09-26 00:28:02 +00:00 committed by Android Git Automerger
commit ee45420799

View file

@ -128,7 +128,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:=