From: Mauro Rossi <issor.oruam@gmail.com>
Date: Sat, 5 Sep 2020 15:59:48 +0000 (+0200)
Subject: android: amd/registers: switch to new generated register definitions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=387b1c239a36d4afff66f6935e2df77d89ed7cf1;p=mesa.git

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>
---

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 $@)