driconf: drop 8% dutch translation

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

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 993a7f179f4ff629ee2c8b6c97033d00aaaddbaa..fee52d4d4e3424128ab000aa8570569df76bee1a 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,11 +69,12 @@ 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.
 #
 
-MESA_DRI_OPTIONS_LANGS := de es nl fr sv
+MESA_DRI_OPTIONS_LANGS := sv
 POT := $(intermediates)/xmlpool.pot
 
 $(POT): $(LOCAL_PATH)/xmlpool/t_options.h
@@ -98,11 +108,14 @@ $(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) $< $(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)