X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.common.mk;h=948561c6b1b4415aed97e90f5874cff86497f2b3;hb=9b3d66087811b7120253e26a585817eec198b521;hp=e8b900697f3e8d7a233c4e68fe790f55bd877b96;hpb=d2cd621086fdf620a96d599bac0873ff58ddf137;p=mesa.git diff --git a/Android.common.mk b/Android.common.mk index e8b900697f3..948561c6b1b 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -24,34 +24,61 @@ # 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 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) + -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 ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ - -DUSE_X86_ASM + -DUSE_X86_ASM \ + -DHAVE_DLOPEN \ + +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