X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2FAndroid.common.mk;h=fe0721aca6f7756f8896725295e65f868cae1cc8;hb=7566a9a58a7de86904b8ce1620d4f011d69090cd;hp=62d4df15118a40ffd0a6f52938c1b5c26e017146;hpb=26aee6f4d5a28350e1f6becfc485ce929c4126f9;p=mesa.git

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 62d4df15118..fe0721aca6f 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -29,8 +29,10 @@ include $(CLEAR_VARS)
 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
 
@@ -42,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 \
@@ -53,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