etnaviv: update Android build files

[mesa.git] / src / gallium / targets / dri / Android.mk

diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 9c43fa1e8fdbcd4a6fb00f295eecd3b5a51f8f15..31d33b255d64fe0836c15bccd77a2e2c6c1ecb4c 100644 (file)
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -40,11 +40,34 @@ LOCAL_LDFLAGS := \
        -Wl,--undefined-version
 
 LOCAL_SHARED_LIBRARIES := \
-       libbacktrace \
        libdl \
        libglapi \
-       libexpat \
-       libz
+       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_STATIC_LIBRARIES += \
+       libetnaviv_drm \
+       libfreedreno_drm \
+       libfreedreno_ir3 \
+       libmesa_gallium \
+       libpanfrost_bifrost \
+       libpanfrost_decode \
+       libpanfrost_encoder \
+       libpanfrost_midgard \
+       libpanfrost_shared
+
+ifeq ($(USE_LIBBACKTRACE),true)
+       LOCAL_SHARED_LIBRARIES += libbacktrace
+endif
 
 $(foreach d, $(MESA_BUILD_GALLIUM), $(eval LOCAL_CFLAGS += $(patsubst HAVE_%,-D%,$(d))))
 
@@ -58,7 +81,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_nir \
        libmesa_dri_common \
        libmesa_megadriver_stub \
-       libmesa_gallium \
        libmesa_pipe_loader \
        libmesa_util \
        libmesa_loader