auxiliary/os: Don't implement os_get_option() on embedded builds.

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index a4ee181b752ef72e3cb1ded739494fba86b1e7e1..d662d6018e4f115e75ffdb2ce75114f533d5be06 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -24,7 +24,7 @@
 # use c99 compiler by default
 ifeq ($(LOCAL_CC),)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CC := $(HOST_CC) -std=c99
+LOCAL_CC := $(HOST_CC) -std=c99 -D_GNU_SOURCE
 else
 LOCAL_CC := $(TARGET_CC) -std=c99
 endif
@@ -68,7 +68,16 @@ LOCAL_CFLAGS += \
 endif
 endif
 
+ifeq ($(MESA_ENABLE_LLVM),true)
+LOCAL_CFLAGS += \
+       -DHAVE_LLVM=0x0305 -DLLVM_VERSION_PATCH=2 \
+       -D__STDC_CONSTANT_MACROS \
+       -D__STDC_FORMAT_MACROS \
+       -D__STDC_LIMIT_MACROS
+endif
+
 LOCAL_CPPFLAGS += \
+       $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
        -Wno-error=non-virtual-dtor \
        -Wno-non-virtual-dtor