Android: amd/common: fix dependency on libmesa_nir

Building libmesa_amd_common fails with:

external/mesa/src/amd/common/ac_shader_info.c:23:10: fatal error: 'nir/nir.h' file not found
         ^

external/mesa/src/compiler/nir/nir.h:48:10: fatal error: 'nir_opcodes.h' file not found
         ^

libmesa_amd_common now depends on libmesa_nir, so add it as a dependency
and export the necessary directories.

Fixes: 224cf29 "radv/ac: add initial pre-pass for shader info gathering"
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index a770aca650056c31959afddc83853b785787e24b..a6c0deb2d726ede2c7217add9ae5bb442fcab778 100644 (file)
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -61,7 +61,9 @@ LOCAL_C_INCLUDES := \
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
        $(LOCAL_PATH)/common
 
-LOCAL_STATIC_LIBRARIES := libLLVMCore
+LOCAL_STATIC_LIBRARIES := \
+       libLLVMCore \
+       libmesa_nir
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
index 96fc750ec646e85b08d34a99f74bcd89d424bff7..908875d7eb563415061e9bcbf04c8b76fe23daf8 100644 (file)
--- a/src/compiler/Android.nir.gen.mk
+++ b/src/compiler/Android.nir.gen.mk
@@ -37,6 +37,7 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_EXPORT_C_INCLUDE_DIRS += \
        $(intermediates)/nir \
+       $(MESA_TOP)/src/compiler \
        $(MESA_TOP)/src/compiler/nir
 
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \