util/format: Use SATURATE

[mesa.git] / src / util / Android.mk

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 2d59e1ae15e8fbc6535bfeb98588504c27fcefac..22f6342365dfdec68bcd2c0100d05a48c7be4570 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -39,10 +39,19 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/gallium/include \
-       $(MESA_TOP)/src/gallium/auxiliary
+       $(MESA_TOP)/src/gallium/auxiliary \
+       $(MESA_TOP)/src/util/format
 
+# 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
 
@@ -60,6 +69,7 @@ LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
 MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
 LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
 
+
 #
 # Generate options.h from gettext translations.
 #
@@ -98,7 +108,7 @@ $(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%.gmo: $(intermediates)/xmlpool/%.
        msgfmt -o $@ $<
 
 $(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
-$(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
+$(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/format/u_format.csv
        $(transform-generated-source)
 
 $(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $< \