X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.common.mk;h=c4823f7dbf12c600cd0cbdba03fea4817f0c8a0b;hb=4cfdd1650083f3e425112ff697538e9818bc8946;hp=1e9f040ac078ccd93a5cbda2eb45a2faaf510497;hpb=57c57df7b4579b60a84062df2e64f84dd84558b5;p=mesa.git

diff --git a/Android.common.mk b/Android.common.mk
index 1e9f040ac07..c4823f7dbf1 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,29 +21,45 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-# use c99 compiler by default
-ifeq ($(LOCAL_CC),)
 ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_CC := $(HOST_CC) -std=c99
-else
-LOCAL_CC := $(TARGET_CC) -std=c99
-endif
+LOCAL_CFLAGS += -D_GNU_SOURCE
 endif
 
 LOCAL_C_INCLUDES += \
+	$(MESA_TOP)/src \
 	$(MESA_TOP)/include
 
+MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
-major := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
-minor := $(word 2, $(subst ., , $(PLATFORM_VERSION)))
 LOCAL_CFLAGS += \
-	-DANDROID_VERSION=0x0$(major)0$(minor)
+	-Wno-unused-parameter \
+	-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 += \
-	-DPTHREADS \
+	-D__STDC_LIMIT_MACROS \
+	-DHAVE___BUILTIN_EXPECT \
+	-DHAVE___BUILTIN_FFS \
+	-DHAVE___BUILTIN_FFSLL \
+	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
+	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
+	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
+	-DHAVE_FUNC_ATTRIBUTE_PACKED \
+	-DHAVE___BUILTIN_CTZ \
+	-DHAVE___BUILTIN_POPCOUNT \
+	-DHAVE___BUILTIN_POPCOUNTLL \
+	-DHAVE___BUILTIN_CLZ \
+	-DHAVE___BUILTIN_CLZLL \
+	-DHAVE___BUILTIN_UNREACHABLE \
+	-DHAVE_PTHREAD=1 \
 	-fvisibility=hidden \
 	-Wno-sign-compare
 
+# mesa requires at least c99 compiler
+LOCAL_CONLYFLAGS += \
+	-std=c99
+
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
@@ -53,7 +69,16 @@ LOCAL_CFLAGS += \
 endif
 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
+endif
+
 LOCAL_CPPFLAGS += \
+	$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
 	-Wno-error=non-virtual-dtor \
 	-Wno-non-virtual-dtor