panfrost: Remove shader state *base

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 60459d16ebae49723a5602b2d09bb65b5f2073b3..825b60381d0832bce1cdf4c7fb0ca9283a3e967c 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -32,6 +32,7 @@ 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 \
@@ -97,12 +98,14 @@ ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),)
 LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET
 endif
 
-ifeq ($(strip $(MESA_ENABLE_ASM)),true)
+# 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