diff options
| author | Robert Foss <robert.foss@collabora.com> | 2019-12-20 15:06:33 +0100 |
|---|---|---|
| committer | Robert Foss <robert.foss@collabora.com> | 2019-12-31 14:06:02 +0100 |
| commit | 182679e7c5523bea54f51b82bae74c8d42ef4c94 (patch) | |
| tree | 455186b48c14826c260fe3bb489c8b5030302b27 | |
| parent | a0d65d860db892352ee5848ed28c5d5b75798df7 (diff) | |
android: Fix u_format_table.c being generated twice
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 <robert.foss@collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
| -rw-r--r-- | src/util/Android.mk | 5 |
1 files changed, 1 insertions, 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) $< \ |