X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2FAndroid.common.mk;h=d5a266215f02af1db424b00a538c0216c13e6749;hb=b3d46cb539c10004fc6e67a435bea29236ce53fc;hp=7d08bfd31d79baa462c2ef91164f35d1d7e58ec3;hpb=56eb2f35702a946c17d6ebae4373f107058417c6;p=mesa.git

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 7d08bfd31d7..d5a266215f0 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -41,11 +41,32 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 intermediates := $(call local-generated-sources-dir)
 LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES))
 
-$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
-$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
+SID_TABLES := $(LOCAL_PATH)/common/sid_tables.py
 
-$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
-	$(transform-generated-source)
+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
+
+$(intermediates)/common/sid_tables.h: $(SID_TABLES) $(SID_TABLES_INPUTS)
+	@mkdir -p $(dir $@)
+	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	$(hide) $(MESA_PYTHON2) $(SID_TABLES) $(SID_TABLES_INPUTS) > $@ || ($(RM) $@; false)
+
+AMDGFXREGS := $(LOCAL_PATH)/registers/makeregheader.py
+
+AMDGFXREGS_INPUTS := \
+	$(LOCAL_PATH)/registers/amdgfxregs.json \
+	$(LOCAL_PATH)/registers/pkt3.json \
+	$(LOCAL_PATH)/registers/gfx10.json \
+	$(LOCAL_PATH)/registers/gfx10-rsrc.json
+
+$(intermediates)/common/amdgfxregs.h: $(AMDGFXREGS) $(AMDGFXREGS_INPUTS)
+	@mkdir -p $(dir $@)
+	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	$(hide) $(MESA_PYTHON2) $(AMDGFXREGS) $(AMDGFXREGS_INPUTS) --sort address --guard AMDGFXREGS_H > $@ || ($(RM) $@; false)
 
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/include \
@@ -55,12 +76,12 @@ LOCAL_C_INCLUDES := \
 	$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
 	$(MESA_TOP)/src/gallium/include \
 	$(MESA_TOP)/src/gallium/auxiliary \
-	$(intermediates)/common \
-	external/llvm/include \
-	external/llvm/device/include
+	$(MESA_TOP)/src/mesa \
+	$(intermediates)/common
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
-	$(LOCAL_PATH)/common
+	$(LOCAL_PATH)/common \
+	$(intermediates)/common
 
 LOCAL_SHARED_LIBRARIES := \
 	libdrm_amdgpu