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

Commit 01394871 authored Feb 01, 2016 by Colin Cross Committed by android-build-merger Feb 01, 2016

Merge "Don\'t force color diagnostics outside of ninja"

am: 41fed8c0

* commit '41fed8c0':
  Don't force color diagnostics outside of ninja

parents b1e250b4 41fed8c0

core/clang/config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,8 +60,10 @@ CLANG_CONFIG_EXTRA_CPPFLAGS += \

		# Force clang to always output color diagnostics. Ninja will strip the ANSI
		# color codes if it is not running in a terminal.
		ifdef BUILDING_WITH_NINJA
		CLANG_CONFIG_EXTRA_CFLAGS += \
		-fcolor-diagnostics
		endif

		CLANG_CONFIG_UNKNOWN_CFLAGS := \
		-finline-functions \

core/config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -587,7 +587,9 @@ 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.
		ifdef BUILDING_WITH_NINJA
		COMMON_GLOBAL_CFLAGS += -fdiagnostics-color
		endif

		COMMON_GLOBAL_CPPFLAGS:= -Wsign-promo
		COMMON_RELEASE_CPPFLAGS:=