summaryrefslogtreecommitdiff
path: root/Android.common.mk
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2017-01-26 13:24:02 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2017-01-27 17:56:57 +0000
commit13e2928d57fc974158dd3e5cf74ac32dfa8ca622 (patch)
tree9fe25ea287a411a30606aee72e6ce45de0d89bc1 /Android.common.mk
parentc4862fa382ff88bd9568be2dba14052c8e51a07f (diff)
android: always set __STDC_*_MACROS for C++ sources
Various parts of the code depend on the macros being defined. Just set those unconditionally, only where needed (c++ sources) so that we can drop the workarounds through the code. Cc: Rob Herring <robh@kernel.org> Cc: Chih-Wei Huang <cwhuang@android-x86.org> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 30166a620b..4fa02ae052 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -44,7 +44,6 @@ LOCAL_CFLAGS += \
LOCAL_CFLAGS += \
-DENABLE_SHADER_CACHE \
- -D__STDC_LIMIT_MACROS \
-DHAVE___BUILTIN_EXPECT \
-DHAVE___BUILTIN_FFS \
-DHAVE___BUILTIN_FFSLL \
@@ -64,6 +63,11 @@ LOCAL_CFLAGS += \
-fvisibility=hidden \
-Wno-sign-compare
+LOCAL_CPPFLAGS += \
+ -D__STDC_CONSTANT_MACROS \
+ -D__STDC_FORMAT_MACROS \
+ -D__STDC_LIMIT_MACROS
+
# mesa requires at least c99 compiler
LOCAL_CONLYFLAGS += \
-std=c99
@@ -78,10 +82,7 @@ endif
ifeq ($(MESA_ENABLE_LLVM),true)
LOCAL_CFLAGS += \
- -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2 \
- -D__STDC_CONSTANT_MACROS \
- -D__STDC_FORMAT_MACROS \
- -D__STDC_LIMIT_MACROS
+ -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
endif
ifneq ($(LOCAL_IS_HOST_MODULE),true)