include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
- $(MESA_UTIL_FILES)
-
-LOCAL_C_INCLUDES := \
- $(MESA_TOP)/src/mesa \
- $(MESA_TOP)/src/mapi \
- $(MESA_TOP)/src/gallium/include \
- $(MESA_TOP)/src/gallium/auxiliary
+ $(MESA_UTIL_FILES) \
+ $(XMLCONFIG_FILES)
LOCAL_MODULE := libmesa_util
-# Generated sources
-
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
intermediates := $(call local-generated-sources-dir)
-LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
-
-$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
-$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
-$(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
- $(transform-generated-source)
-
-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 := \
+ external/zlib \
$(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 \
+ $(intermediates)/format
-LOCAL_MODULE := libmesa_util
+# 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
# Generated sources
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
-intermediates := $(call local-generated-sources-dir)
-LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
+UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
+LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
+
+format_srgb_gen := $(LOCAL_PATH)/format_srgb.py
+
+$(intermediates)/format_srgb.c: $(format_srgb_gen)
+ @mkdir -p $(dir $@)
+ $(hide) $(MESA_PYTHON2) $(format_srgb_gen) $< > $@
-$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
-$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
-$(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
- $(transform-generated-source)
+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
+
+$(intermediates)/format/u_format_pack.h: $(u_format_deps)
+ @mkdir -p $(dir $@)
+ $(hide) $(MESA_PYTHON2) $(u_format_gen) --header $< > $@
+
+$(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)