glsl: simplify disable_varying_optimizations_for_sso

[mesa.git] / Android.common.mk

diff --git a/Android.common.mk b/Android.common.mk
index 5e7fd9445ad615b77a8a3181666e453b59a8d5f3..6bd30816bc41d5e21e6d58faa0419f522b480800 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -37,6 +37,7 @@ LOCAL_CFLAGS += \
        -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\"
 
@@ -44,6 +45,7 @@ LOCAL_CFLAGS += \
 # It's likely due to a bug elsewhere, but let's temporarily add them
 # here to fix the radeonsi build.
 LOCAL_CFLAGS += \
+       -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
        -DENABLE_SHADER_CACHE \
        -D__STDC_CONSTANT_MACROS \
        -D__STDC_LIMIT_MACROS \
@@ -64,6 +66,7 @@ LOCAL_CFLAGS += \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
        -DHAVE_DL_ITERATE_PHDR \
+       -DMAJOR_IN_SYSMACROS \
        -fvisibility=hidden \
        -Wno-sign-compare
 
@@ -103,7 +106,3 @@ endif
 
 # Quiet down the build system and remove any .h files from the sources
 LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES))
-
-ifneq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_SHARED_LIBRARIES += libz
-endif