glsl: Rewrite atan2 implementation to fix accuracy and handling of zero/infinity.

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 4f02fc7371e33126f4470dbd322abcb52b5b3c71..4fa02ae05214708e44f9ced99afa0d525519dd99 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -34,12 +34,16 @@ MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 LOCAL_CFLAGS += \
        -Wno-unused-parameter \
        -Wno-date-time \
+       -Wno-pointer-arith \
+       -Wno-missing-field-initializers \
+       -Wno-initializer-overrides \
+       -Wno-mismatched-tags \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \
        -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION)
 
 LOCAL_CFLAGS += \
-       -D__STDC_LIMIT_MACROS \
+       -DENABLE_SHADER_CACHE \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
@@ -47,6 +51,7 @@ LOCAL_CFLAGS += \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
+       -DHAVE_FUNC_ATTRIBUTE_ALIAS \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -58,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
@@ -72,10 +82,15 @@ 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)
+# add libdrm if there are hardware drivers
+ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
+LOCAL_CFLAGS += -DHAVE_LIBDRM
+LOCAL_SHARED_LIBRARIES += libdrm
+endif
 endif
 
 LOCAL_CPPFLAGS += \
@@ -83,6 +98,13 @@ LOCAL_CPPFLAGS += \
        -Wno-error=non-virtual-dtor \
        -Wno-non-virtual-dtor
 
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+  LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+  LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
+else
+  LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+endif
+
 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false