radv: declare new extended dynamic states

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

diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk
index ab39ba3b7238081fd42ca5c0cc6b3db86805a31a..d5d6a81f7963a5cfc4609e391c5ebd315944f64c 100644 (file)
--- a/src/amd/vulkan/Android.mk
+++ b/src/amd/vulkan/Android.mk
@@ -30,11 +30,10 @@ include $(LOCAL_PATH)/Makefile.sources
 RADV_COMMON_INCLUDES := \
        $(MESA_TOP)/include \
        $(MESA_TOP)/src/ \
+       $(MESA_TOP)/src/amd/vulkan \
        $(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,15 +65,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 \
-       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_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
 
@@ -147,13 +144,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 \
@@ -162,7 +153,9 @@ 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