util: Mark the format description getter functions as const.

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

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 6b38cf9afb259f9847d14a9ca9186998bfc652af..ec37c69a502059d96366948cb9e88a65d354d931 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -31,72 +31,59 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-       $(MESA_UTIL_FILES)
+       $(MESA_UTIL_FILES) \
+       $(XMLCONFIG_FILES)
 
 LOCAL_C_INCLUDES := \
+       external/zlib \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src
+       $(MESA_TOP)/src/gallium/include \
+       $(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
 
 # Generated sources
 
-ifeq ($(LOCAL_MODULE_CLASS),)
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-endif
-
-intermediates := $(call local-intermediates-dir)
-
-# This is the list of auto-generated files: sources and headers
-sources := $(addprefix $(intermediates)/, $(MESA_UTIL_GENERATED_FILES))
-
-LOCAL_GENERATED_SOURCES += $(sources)
-
-FORMAT_SRGB := $(LOCAL_PATH)/format_srgb.py
-
-$(intermediates)/format_srgb.c: $(FORMAT_SRGB)
-       @$(MESA_PYTHON2) $(FORMAT_SRGB) $< > $@
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)
-
-# ---------------------------------------
-# Build host libmesa_util
-# ---------------------------------------
 
-include $(CLEAR_VARS)
-
-LOCAL_IS_HOST_MODULE := true
-LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
-
-LOCAL_SRC_FILES := \
-       $(MESA_UTIL_FILES)
-
-LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src
+intermediates := $(call local-generated-sources-dir)
 
-LOCAL_MODULE := libmesa_util
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 
-# Generated sources
+UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
+LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
 
-ifeq ($(LOCAL_MODULE_CLASS),)
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-endif
-
-intermediates := $(call local-intermediates-dir)
+format_srgb_gen := $(LOCAL_PATH)/format_srgb.py
 
-# This is the list of auto-generated files: sources and headers
-sources := $(addprefix $(intermediates)/, $(MESA_UTIL_GENERATED_FILES))
+$(intermediates)/format_srgb.c: $(format_srgb_gen)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(format_srgb_gen) $< > $@
 
-LOCAL_GENERATED_SOURCES += $(sources)
+u_format_gen := $(LOCAL_PATH)/format/u_format_table.py
+u_format_deps := $(LOCAL_PATH)/format/u_format.csv \
+       $(LOCAL_PATH)/format/u_format_pack.py \
+       $(LOCAL_PATH)/format/u_format_parse.py
 
-FORMAT_SRGB := $(LOCAL_PATH)/format_srgb.py
+$(intermediates)/format/u_format_pack.h: $(u_format_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(u_format_gen) --header $< > $@
 
-$(intermediates)/format_srgb.c: $(FORMAT_SRGB)
-       @$(MESA_PYTHON2) $(FORMAT_SRGB) $< > $@
+$(intermediates)/format/u_format_table.c: $(u_format_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $(u_format_gen) $< > $@
 
 include $(MESA_COMMON_MK)
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)