summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.common.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 30166a620bb..4fa02ae0521 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)