summaryrefslogtreecommitdiffstats
path: root/src/amd
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-05-03 14:35:17 -0500
committerEmil Velikov <[email protected]>2017-05-11 13:52:21 +0100
commit1ef913aacfaca03bd951f23c4a60d1fccd5c3b6c (patch)
tree0fabb652ba73665fa90330f09afdd7d7eaf4b87f /src/amd
parent108250197996d76fbfe4ab437a696862d9a1971d (diff)
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 <[email protected]> Reviewed-by: Chih-Wei Huang <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/amd')
-rw-r--r--src/amd/Android.common.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index a770aca6500..a6c0deb2d72 100644
--- 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)