radeonsi: remove redundant si_shader_info::const_buffers_declared

[mesa.git] / src / intel / Android.common.mk

diff --git a/src/intel/Android.common.mk b/src/intel/Android.common.mk
index 12cea6e54727ced9e7a3fc724110df39e955f055..79d9f1284a0f2e9a28f3ef4c66f245b8f093d6e5 100644 (file)
--- a/src/intel/Android.common.mk
+++ b/src/intel/Android.common.mk
@@ -38,7 +38,17 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
-LOCAL_SHARED_LIBRARIES := libexpat libz
+LOCAL_SHARED_LIBRARIES := libz liblog
+
+# If Android version >=8 MESA should static link libexpat else should dynamic link
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_STATIC_LIBRARIES := \
+       libexpat
+else
+LOCAL_SHARED_LIBRARIES += \
+       libexpat
+endif
+
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml