radeonsi: don't use lp_build_if for the wrapping if block in merged shaders

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 36d97c52dd1d77d21c5f0a4199f955bd82ba1585..825b60381d0832bce1cdf4c7fb0ca9283a3e967c 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -98,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