Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84494473 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am aaa9d8dc: Merge "Fix windows build"

* commit 'aaa9d8dc':
  Fix windows build
parents cf26cbfb aaa9d8dc
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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:=