android: aco: add support for libmesa_aco

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

diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
index 9574bf54e5a08a2828d35f64461816b37f6ab5a4..f01e10f90035bc9007263984640c80fcadafd382 100644 (file)
--- a/src/amd/vulkan/Android.mk
+++ b/src/amd/vulkan/Android.mk
@@ -33,8 +33,6 @@ RADV_COMMON_INCLUDES := \
        $(MESA_TOP)/src/vulkan/wsi \
        $(MESA_TOP)/src/vulkan/util \
        $(MESA_TOP)/src/amd \
-       $(MESA_TOP)/src/amd/common \
-       $(MESA_TOP)/src/compiler \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/mesa/drivers/dri/common \
@@ -66,14 +64,13 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
 
 $(call mesa-build-with-llvm)
 
-LOCAL_C_INCLUDES := \
-       $(RADV_COMMON_INCLUDES) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
+LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES)
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+LOCAL_STATIC_LIBRARIES := \
+       libmesa_aco \
+       libmesa_amd_common \
+       libmesa_nir \
+       libmesa_util \
        libmesa_vulkan_util \
        libmesa_git_sha1
 
@@ -82,6 +79,7 @@ LOCAL_GENERATED_SOURCES += $(intermediates)/radv_entrypoints.h
 LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.c
 LOCAL_GENERATED_SOURCES += $(intermediates)/radv_extensions.h
 LOCAL_GENERATED_SOURCES += $(intermediates)/vk_format_table.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/gfx10_format_table.h
 
 RADV_ENTRYPOINTS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_entrypoints_gen.py
 RADV_EXTENSIONS_SCRIPT := $(MESA_TOP)/src/amd/vulkan/radv_extensions.py
@@ -116,6 +114,20 @@ $(intermediates)/vk_format_table.c: $(VK_FORMAT_TABLE_SCRIPT) \
        @mkdir -p $(dir $@)
        $(MESA_PYTHON2) $(VK_FORMAT_TABLE_SCRIPT) $(vk_format_layout_csv) > $@
 
+RADV_GEN10_FORMAT_TABLE_INPUTS := \
+       $(MESA_TOP)/src/amd/vulkan/vk_format_layout.csv \
+       $(MESA_TOP)/src/amd/registers/gfx10-rsrc.json
+
+RADV_GEN10_FORMAT_TABLE_DEP := \
+       $(MESA_TOP)/src/amd/registers/regdb.py
+
+RADV_GEN10_FORMAT_TABLE := $(LOCAL_PATH)/gfx10_format_table.py
+
+$(intermediates)/gfx10_format_table.h: $(RADV_GEN10_FORMAT_TABLE) $(RADV_GEN10_FORMAT_TABLE_INPUTS) $(RADV_GEN10_FORMAT_TABLE_DEP)
+       @mkdir -p $(dir $@)
+       @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+       $(hide) $(MESA_PYTHON2) $(RADV_GEN10_FORMAT_TABLE) $(RADV_GEN10_FORMAT_TABLE_INPUTS) > $@ || ($(RM) $@; false)
+
 LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES)
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
@@ -146,13 +158,7 @@ LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
 
 $(call mesa-build-with-llvm)
 
-LOCAL_C_INCLUDES := \
-       $(RADV_COMMON_INCLUDES) \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_radv_common,,)
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-       $(MESA_TOP)/src/amd/vulkan \
-       $(intermediates)
+LOCAL_C_INCLUDES := $(RADV_COMMON_INCLUDES)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_util \
@@ -161,9 +167,20 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
        libmesa_compiler \
        libmesa_amdgpu_addrlib \
        libmesa_amd_common \
-       libmesa_radv_common
+       libmesa_radv_common \
+       libmesa_vulkan_util \
+       libmesa_aco
 
 LOCAL_SHARED_LIBRARIES += $(RADV_SHARED_LIBRARIES) libz libsync liblog
 
+# If Android version >=8 MESA should static link libexpat else should dynamic link
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
+LOCAL_STATIC_LIBRARIES := \
+       libexpat
+else
+LOCAL_SHARED_LIBRARIES += \
+       libexpat
+endif
+
 include $(MESA_COMMON_MK)
 include $(BUILD_SHARED_LIBRARY)