X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Android.common.mk;h=b866293b18e3a6e7669d525830572396dff24223;hb=9b3c7481c61098be1f780f91d8e06dc55afd5b0b;hp=c4823f7dbf12c600cd0cbdba03fea4817f0c8a0b;hpb=5c7f97426dee3678beb879c94cd8906c33b8f3dc;p=mesa.git

diff --git a/Android.common.mk b/Android.common.mk
index c4823f7dbf1..b866293b18e 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -33,6 +33,7 @@ MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 # define ANDROID_VERSION (e.g., 4.0.x => 0x0400)
 LOCAL_CFLAGS += \
 	-Wno-unused-parameter \
+	-Wno-date-time \
 	-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)
@@ -53,6 +54,7 @@ LOCAL_CFLAGS += \
 	-DHAVE___BUILTIN_CLZLL \
 	-DHAVE___BUILTIN_UNREACHABLE \
 	-DHAVE_PTHREAD=1 \
+	-DHAVE_DLOPEN \
 	-fvisibility=hidden \
 	-Wno-sign-compare
 
@@ -64,7 +66,6 @@ ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
 	-DUSE_X86_ASM \
-	-DHAVE_DLOPEN \
 
 endif
 endif
@@ -82,9 +83,19 @@ 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
 
 ifeq ($(strip $(LOCAL_MODULE_TAGS)),)
 LOCAL_MODULE_TAGS := optional
 endif
+
+# Quiet down the build system and remove any .h files from the sources
+LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))