projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: fix indentation, comments and line lengths in ast_function.cpp
[mesa.git]
/
Android.common.mk
diff --git
a/Android.common.mk
b/Android.common.mk
index b866293b18e3a6e7669d525830572396dff24223..dee22dae097aab40c9a4b68871db13bca8574faf 100644
(file)
--- a/
Android.common.mk
+++ b/
Android.common.mk
@@
-34,6
+34,10
@@
MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
LOCAL_CFLAGS += \
-Wno-unused-parameter \
-Wno-date-time \
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)
-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)
@@
-78,6
+82,12
@@
LOCAL_CFLAGS += \
-D__STDC_LIMIT_MACROS
endif
-D__STDC_LIMIT_MACROS
endif
+# add libdrm if there are hardware drivers
+ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
+LOCAL_CFLAGS += -DHAVE_LIBDRM
+LOCAL_SHARED_LIBRARIES += libdrm
+endif
+
LOCAL_CPPFLAGS += \
$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
-Wno-error=non-virtual-dtor \
LOCAL_CPPFLAGS += \
$(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
-Wno-error=non-virtual-dtor \