i965/perf: restore mdapi statistics query metrics

[mesa.git] / src / mesa / drivers / dri / Android.mk

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 72a5593fefadfea4cee78df2b6c5a900bc7f4d1a..60c8476a38a7b6955bf7583ab338f35990077104 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -49,21 +49,21 @@ MESA_DRI_WHOLE_STATIC_LIBRARIES := \
 MESA_DRI_SHARED_LIBRARIES := \
        libcutils \
        libdl \
-       libexpat \
        libglapi \
-       liblog
+       liblog \
+       libz
 
-#-----------------------------------------------
-# Build drivers and libmesa_dri_common
-
-SUBDIRS := common
-
-ifneq ($(filter i915, $(MESA_GPU_DRIVERS)),)
-       SUBDIRS += i915
+# If Android version >=8 MESA should static link libexpat else should dynamic link
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+MESA_DRI_WHOLE_STATIC_LIBRARIES += \
+       libexpat
+else
+MESA_DRI_SHARED_LIBRARIES += \
+       libexpat
 endif
 
-ifneq ($(filter i965, $(MESA_GPU_DRIVERS)),)
-       SUBDIRS += i965
-endif
+#-----------------------------------------------
+# Build drivers and libmesa_dri_common
 
+SUBDIRS := common i915 i965
 include $(foreach d, $(SUBDIRS), $(LOCAL_PATH)/$(d)/Android.mk)