drm-shim: Let the driver choose to overwrite the first render node.

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index fcd9a874d5381b66c0847f3b38478feaac1794de..2d04573c4336b4ff167df2f67e4148df1f0521f3 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -32,14 +32,14 @@ LOCAL_C_INCLUDES += \
 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 LOCAL_CFLAGS += \
        -Wno-error \
+       -Werror=incompatible-pointer-types \
        -Wno-unused-parameter \
        -Wno-pointer-arith \
        -Wno-missing-field-initializers \
        -Wno-initializer-overrides \
        -Wno-mismatched-tags \
-       -DVERSION=\"$(MESA_VERSION)\" \
        -DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-       -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"
+       -DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/issues\"
 
 # XXX: The following __STDC_*_MACROS defines should not be needed.
 # It's likely due to a bug elsewhere, but let's temporarily add them
@@ -52,11 +52,15 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_EXPECT \
        -DHAVE___BUILTIN_FFS \
        -DHAVE___BUILTIN_FFSLL \
+       -DHAVE_DLFCN_H \
        -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
        -DHAVE_FUNC_ATTRIBUTE_UNUSED \
        -DHAVE_FUNC_ATTRIBUTE_FORMAT \
        -DHAVE_FUNC_ATTRIBUTE_PACKED \
        -DHAVE_FUNC_ATTRIBUTE_ALIAS \
+       -DHAVE_FUNC_ATTRIBUTE_NORETURN \
+       -DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \
+       -DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \
        -DHAVE___BUILTIN_CTZ \
        -DHAVE___BUILTIN_POPCOUNT \
        -DHAVE___BUILTIN_POPCOUNTLL \
@@ -66,8 +70,14 @@ LOCAL_CFLAGS += \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLADDR \
        -DHAVE_DL_ITERATE_PHDR \
+       -DHAVE_LINUX_FUTEX_H \
+       -DHAVE_ENDIAN_H \
+       -DHAVE_ZLIB \
        -DMAJOR_IN_SYSMACROS \
+       -DVK_USE_PLATFORM_ANDROID_KHR \
        -fvisibility=hidden \
+       -fno-math-errno \
+       -fno-trapping-math \
        -Wno-sign-compare
 
 LOCAL_CPPFLAGS += \
@@ -81,12 +91,21 @@ LOCAL_CPPFLAGS += \
 LOCAL_CONLYFLAGS += \
        -std=c99
 
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+# c11 timespec_get is part of bionic as well
+# https://android-review.googlesource.com/c/718518
+# This means releases from P and earlier won't need this
+ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),)
+LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET
+endif
+
+# Android's libc began supporting shm in Oreo
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
+LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
+endif
+
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
        -DUSE_X86_ASM
-
-endif
 endif
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 LOCAL_CFLAGS_arm += -DUSE_ARM_ASM