freedreno/a6xx: fix hangs with newer sqe fw

[mesa.git] / src / gallium / drivers / nouveau / Android.mk

diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
index 3b26b592cdd61c450db939cd5bb02ed7d97cf245..49a341c8314524b063788f1f9735e79c88181ceb 100644 (file)
--- a/src/gallium/drivers/nouveau/Android.mk
+++ b/src/gallium/drivers/nouveau/Android.mk
@@ -36,9 +36,22 @@ LOCAL_SRC_FILES := \
        $(NVC0_CODEGEN_SOURCES) \
        $(NVC0_C_SOURCES)
 
+LOCAL_C_INCLUDES := \
+       $(MESA_TOP)/include \
+       $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+       $(MESA_TOP)/src/compiler/nir \
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/mesa
+
+LOCAL_STATIC_LIBRARIES := libmesa_nir
 LOCAL_SHARED_LIBRARIES := libdrm_nouveau
 LOCAL_MODULE := libmesa_pipe_nouveau
 
-LOCAL_C_INCLUDES := external/libcxx/include
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
+
+ifneq ($(HAVE_GALLIUM_NOUVEAU),)
+GALLIUM_TARGET_DRIVERS += nouveau
+$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_nouveau)
+$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
+endif