Adding libmesa_amd_common dependency and exporting its headers,
avoids the following building error:
external/mesa/src/gallium/drivers/r600/evergreen_compute.c:29:10: fatal error:
'ac_binary.h' file not found
^
1 error generated.
Fixes: 3bbbb63 "automake: r600: radeonsi: correctly manage libamd_common.la
linking"
Fixes: 503fb13 "radeon/ac: switch to ac_shader_binary_config_start()"
---
src/amd/Android.common.mk | 2 ++
src/gallium/drivers/r600/Android.mk | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index faace71..0e0401b 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -59,5 +59,7 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES := libLLVMCore
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/amd/common
+
include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/drivers/r600/Android.mk
b/src/gallium/drivers/r600/Android.mk
index eac3116..76ec3d0 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -32,6 +32,7 @@ LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
+LOCAL_STATIC_LIBRARIES := libmesa_amd_common
LOCAL_SHARED_LIBRARIES := libdrm_radeon
LOCAL_MODULE := libmesa_pipe_r600
--
2.10.2
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
