From 182679e7c5523bea54f51b82bae74c8d42ef4c94 Mon Sep 17 00:00:00 2001 From: Robert Foss Date: Fri, 20 Dec 2019 15:06:33 +0100 Subject: [PATCH] android: Fix u_format_table.c being generated twice MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Two competing rules for defining u_format_table.c exists, which is an error. Additionally the more general rule lacks the inclusion of format/u_format.csv. Fixes: 882ca6dfb0 ("util: Move gallium's PIPE_FORMAT utils to /util/format/") Signed-off-by: Robert Foss Reviewed-by: Tapani Pälli --- src/util/Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/Android.mk b/src/util/Android.mk index 0bf90910998..22f6342365d 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -70,9 +70,6 @@ MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H) -$(intermediates)/format/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/format/u_format.csv - $(transform-generated-source) - # # Generate options.h from gettext translations. # @@ -111,7 +108,7 @@ $(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) $< \ -- 2.30.2