AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: util/format: fix generated sources rules

Browse Source 
Changes are necessary after commit 84ed2d098
("util/format: expose generated format packing functions through a header")
because script for format/u_format_pack.h has different commandline
compared to existing pattern

Generated sources rules are ported from meson

Fixes: 84ed2d098 ("util/format: expose generated format packing functions through a header")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6319>
This commit is contained in:
Mauro Rossi
2020-08-14 14:04:54 +02:00
parent b41e74ae4a
commit aa8661141a
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/Android.mk
+18 -4
View File
@@ -66,10 +66,24 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
$(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
$(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/format/u_format.csv
$(transform-generated-source)
format_srgb_gen := $(LOCAL_PATH)/format_srgb.py
$(intermediates)/format_srgb.c: $(format_srgb_gen)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $(format_srgb_gen) $< > $@
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_STATIC_LIBRARY)