diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2020-12-05 16:40:12 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-07 13:10:32 +0000 |
| commit | 0553e717e41c10f312618f8a49fae224786d1932 (patch) | |
| tree | c68dfe6bf6766ba2cd6d81083cdba177b3c00c96 | |
| parent | 98df055736c6adb916edcb8e6187adef2369787d (diff) | |
android: gallium/aux: update old generated sources rules
This is in preparation for additional generated sources rules for Android
which will require ad hoc rules, so it is necessary to replace old ones
NOTE: pre-existing gen rules based on $(transform-generated-source) macro
are both obsolete and use of '%' pattern rule is incompatible with ad hoc
python commands for different targets
Changelog:
- remove util/u_format_srgb.c target
- replace obsolete indices/{u_indices,unfilled}_gen.c 'common' gen rules
with 'per target' gen rules using $(MESA_PYTHON3) as per meson gen rules
Fixes: 3471af9c6cfa ("gallium/aux: Add GPU tracepoint mechanism")
Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7942>
| -rw-r--r-- | src/gallium/auxiliary/Android.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk index 664742ff48d..8ce58a3a9b6 100644 --- a/src/gallium/auxiliary/Android.mk +++ b/src/gallium/auxiliary/Android.mk @@ -64,13 +64,19 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(GENERATED_SOURCES)) -$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2) -$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@ +u_indices_gen_deps := \ + $(MESA_TOP)/src/gallium/auxiliary/indices/u_indices_gen.py -$(intermediates)/indices/u_indices_gen.c \ -$(intermediates)/indices/u_unfilled_gen.c \ -$(intermediates)/util/u_format_srgb.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py - $(transform-generated-source) +$(intermediates)/indices/u_indices_gen.c: $(u_indices_gen_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON3) $< > $@ + +u_unfilled_gen_deps := \ + $(MESA_TOP)/src/gallium/auxiliary/indices/u_unfilled_gen.py + +$(intermediates)/indices/u_unfilled_gen.c: $(u_unfilled_gen_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON3) $< > $@ LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H) |