util: Use util_is_power_of_two_nonzero in u_vector

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

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 9015b59e45290873f685a506d471da52b0140dc7..9b6144268e65ff26264e832609d6922954700de2 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -41,6 +41,9 @@ LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/gallium/include \
        $(MESA_TOP)/src/gallium/auxiliary
 
+LOCAL_SHARED_LIBRARIES := \
+       libexpat
+
 LOCAL_MODULE := libmesa_util
 
 # Generated sources
@@ -48,6 +51,9 @@ LOCAL_MODULE := libmesa_util
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
 UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
 LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
 
@@ -95,7 +101,7 @@ $(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) \
+$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $< $(PRIVATE_TEMPLATE_HEADER) \
                $(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
 $(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
        $(transform-generated-source)