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]>

4 files changed, 20 insertions, 9 deletions

diff --git a/src/gallium/drivers/iris/meson.build b/src/gallium/drivers/iris/meson.build
index 6b6263c3753..a953524a643 100644
--- a/src/gallium/drivers/iris/meson.build
+++ b/src/gallium/drivers/iris/meson.build
@@ -86,9 +86,9 @@ libiris = static_library(
   ],
   c_args : [c_vis_args, c_sse2_args],
   cpp_args : [cpp_vis_args, c_sse2_args],
-  dependencies : [dep_libdrm, dep_valgrind, idep_genxml],
+  dependencies : [dep_libdrm, dep_valgrind, idep_genxml, idep_libintel_common],
   link_with : [
-    iris_gen_libs, libintel_common, libintel_compiler, libintel_dev, libisl,
+    iris_gen_libs, libintel_compiler, libintel_dev, libisl,
     libblorp
   ],
 )
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
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index c1558b79439..5aa35738060 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -164,7 +164,6 @@ if with_xlib_lease
 endif
 
 if with_platform_android
-  anv_deps += dep_android
   anv_flags += '-DVK_USE_PLATFORM_ANDROID_KHR'
   libanv_files += files('anv_android.c')
 else
@@ -193,11 +192,10 @@ libvulkan_intel = shared_library(
   ],
   link_whole : [libanv_common, libanv_gen_libs],
   link_with : [
-    libintel_compiler, libintel_common, libintel_dev, libisl, libblorp,
-    libvulkan_wsi,
+    libintel_compiler, libintel_dev, libisl, libblorp, libvulkan_wsi,
   ],
   dependencies : [
-    dep_thread, dep_dl, dep_m, anv_deps,
+    dep_thread, dep_dl, dep_m, anv_deps, idep_libintel_common,
     idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil,
   ],
   c_args : anv_flags,
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index 3c507126f08..465567add3f 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -157,8 +157,11 @@ libi965 = static_library(
   c_args : [c_vis_args, no_override_init_args, c_sse2_args],
   cpp_args : [cpp_vis_args, c_sse2_args],
   link_with : [
-    i965_gen_libs, libintel_common, libintel_dev, libisl, libintel_compiler,
-    libblorp, libintel_perf
+    i965_gen_libs, libintel_dev, libisl, libintel_compiler, libblorp,
+    libintel_perf
+  ],
+  dependencies : [
+    dep_libdrm, dep_valgrind, idep_libintel_common, idep_nir_headers, idep_genxml,
+    idep_xmlconfig,
   ],
-  dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_xmlconfig],
 )