diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2020-09-05 17:59:48 +0200 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2020-09-06 20:20:34 +0200 |
| commit | fb42d73a9d9c49043e15fe747a3376dad663c9b1 (patch) | |
| tree | 338584509e7a8c3abb76bb7d0a0bd92f3a5883a7 | |
| parent | e8d55e6db366a1c93501cd208999820c002ddb82 (diff) | |
android: amd/registers: switch to new generated register definitions
Android building rules are aligned to meson ones
Fixes the following building error:
FAILED: ninja: 'external/mesa/src/amd/registers/amdgfxregs.json',
needed by 'out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_amd_common_intermediates/common/sid_tables.h',
missing and no known rule to make it
Fixes: b7a6333ee ("amd/registers: switch to new generated register definitions")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6618>
| -rw-r--r-- | src/amd/Android.common.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk index 6b83f39662f..d9aa66fd23e 100644 --- a/src/amd/Android.common.mk +++ b/src/amd/Android.common.mk @@ -42,14 +42,23 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES)) +AMD_JSON_FILES := \ + $(LOCAL_PATH)/registers/gfx6.json \ + $(LOCAL_PATH)/registers/gfx7.json \ + $(LOCAL_PATH)/registers/gfx8.json \ + $(LOCAL_PATH)/registers/gfx81.json \ + $(LOCAL_PATH)/registers/gfx9.json \ + $(LOCAL_PATH)/registers/gfx10.json \ + $(LOCAL_PATH)/registers/gfx103.json \ + $(LOCAL_PATH)/registers/pkt3.json \ + $(LOCAL_PATH)/registers/gfx10-rsrc.json \ + $(LOCAL_PATH)/registers/registers-manually-defined.json + SID_TABLES := $(LOCAL_PATH)/common/sid_tables.py SID_TABLES_INPUTS := \ $(LOCAL_PATH)/common/sid.h \ - $(LOCAL_PATH)/registers/amdgfxregs.json \ - $(LOCAL_PATH)/registers/pkt3.json \ - $(LOCAL_PATH)/registers/gfx10.json \ - $(LOCAL_PATH)/registers/gfx10-rsrc.json + $(AMD_JSON_FILES) $(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS) @mkdir -p $(dir $@) @@ -59,16 +68,7 @@ $(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS) AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py AMDGFXREGS_INPUTS := \ - $(LOCAL_PATH)/registers/gfx6.json \ - $(LOCAL_PATH)/registers/gfx7.json \ - $(LOCAL_PATH)/registers/gfx8.json \ - $(LOCAL_PATH)/registers/gfx81.json \ - $(LOCAL_PATH)/registers/gfx9.json \ - $(LOCAL_PATH)/registers/gfx10.json \ - $(LOCAL_PATH)/registers/gfx103.json \ - $(LOCAL_PATH)/registers/pkt3.json \ - $(LOCAL_PATH)/registers/gfx10-rsrc.json \ - $(LOCAL_PATH)/registers/registers-manually-defined.json + $(AMD_JSON_FILES) $(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) @mkdir -p $(dir $@) |