ac/registers: use better names for disambiguated definitions

[mesa.git] / src / amd / Android.common.mk

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index e3915b45bfe71bd7442030441b0386ded6f4582a..fe0721aca6f7756f8896725295e65f868cae1cc8 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -31,7 +31,8 @@ LOCAL_MODULE := libmesa_amd_common
 LOCAL_SRC_FILES := \
        $(AMD_COMMON_FILES) \
        $(AMD_COMPILER_FILES) \
-       $(AMD_DEBUG_FILES)
+       $(AMD_DEBUG_FILES) \
+       $(AMD_NIR_FILES)
 
 LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare LLVMInitializeAMDGPU* functions
 
@@ -43,9 +44,12 @@ LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES)
 $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
 $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
 
-$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
+$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(LOCAL_PATH)/common/sid.h $(LOCAL_PATH)/registers/amdgfxregs.json $(LOCAL_PATH)/registers/pkt3.json
        $(transform-generated-source)
 
+$(intermediates)/common/amdgfxregs.h: $(LOCAL_PATH)/registers/makeregheader.py $(LOCAL_PATH)/registers/amdgfxregs.json $(LOCAL_PATH)/registers/pkt3.json
+       $(transform-generated-source) --sort address --guard AMDGFXREGS_H
+
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/include \
        $(MESA_TOP)/src \
@@ -54,13 +58,14 @@ 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
+       $(intermediates)/common
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(LOCAL_PATH)/common
 
+LOCAL_SHARED_LIBRARIES := \
+       libdrm_amdgpu
+
 LOCAL_STATIC_LIBRARIES := \
        libmesa_nir