X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futil%2FAndroid.mk;h=13e44f97c2a2469b1ad0e58a4f81df65ca3ebde3;hb=ded6ea92098a8393db554c3f0f08ec90720ddcf4;hp=993a7f179f4ff629ee2c8b6c97033d00aaaddbaa;hpb=0621e91a8c975e34f2c2092ad3013d6ff81b5ac2;p=mesa.git

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 993a7f179f4..13e44f97c2a 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -41,8 +41,16 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/gallium/include \
 	$(MESA_TOP)/src/gallium/auxiliary
 
+# 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_SHARED_LIBRARIES += liblog
 
 LOCAL_MODULE := libmesa_util
 
@@ -101,8 +109,11 @@ $(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
 $(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
 	$(transform-generated-source)
 
-$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $< $(PRIVATE_TEMPLATE_HEADER) \
-		$(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
+$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $< \
+		--template $(PRIVATE_TEMPLATE_HEADER) \
+		--output $@ \
+		--localedir $(PRIVATE_LOCALEDIR) \
+		--languages $(MESA_DRI_OPTIONS_LANGS)
 $(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
 	$(transform-generated-source)