summaryrefslogtreecommitdiffstats
path: root/src/intel/common
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <[email protected]>2019-07-26 13:49:59 +0200
committerBas Nieuwenhuizen <[email protected]>2019-08-07 15:34:46 +0200
commit5a26f528cb86697ff9f68998a0fe5c2f4ca75855 (patch)
tree8b72779d98573075d4e24f3a63231c60ee0bc5d6 /src/intel/common
parentda9e2958ec3d0cb7ff8aba5b2eb3d6be3cb53bb3 (diff)
meson,i965: Link with android deps when building for android.
The DBG marco in brw_blorp.c ends up calling an android log function: error: undefined reference to '__android_log_print' v2: On suggestion from Lionel, hang the Android dependency onto a new libintel_common dependency. Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'src/intel/common')
-rw-r--r--src/intel/common/meson.build10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
index 37c9edcc3e1..26e31b0ef1d 100644
--- a/src/intel/common/meson.build
+++ b/src/intel/common/meson.build
@@ -45,6 +45,16 @@ libintel_common = static_library(
dependencies : [dep_expat, dep_libdrm, dep_thread, idep_genxml],
)
+libintel_extra_dependencies = []
+if with_platform_android
+ libintel_extra_dependencies += dep_android
+endif
+
+idep_libintel_common = declare_dependency(
+ link_with: [libintel_common],
+ dependencies: [libintel_extra_dependencies],
+)
+
install_intel_gpu_tests = get_option('install-intel-gpu-tests')
if install_intel_gpu_tests