[pulseaudio-commits] [Git][pulseaudio/webrtc-audio-processing][master] 2 commits: Fix build on Android

[Arun Raghavan (@arun)]

Arun Raghavan pushed to branch master at PulseAudio / webrtc-audio-processing


Commits:
589a7445 by Arun Raghavan at 2021-06-05T18:16:18-04:00
Fix build on Android

There's a bit of system integration that we haven't pulled in (as it has
transitive dependencies), so we manually stub it out.

- - - - -
e74894ba by Arun Raghavan at 2021-06-05T18:37:23-04:00
build: Add library-based absl detection as a fallback

This should help for cases where users can make abseil-cpp available but
wiring up the CMake-build isn't that easy (for example, while
cross-compiling).

- - - - -


2 changed files:

- meson.build
- webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h


Changes:

=====================================
meson.build
=====================================
@@ -46,9 +46,47 @@ absl_dep = dependency('absl', method : 'cmake',
     'absl::flags_parse',
     'absl::strings',
     'absl::synchronization',
-  ]
+  ],
+  required : false,
 )
 
+if not absl_dep.found()
+  warning('Could not find abseil-cpp with CMake, using fallback library detection which may fail.')
+  absl_libs = [
+    'absl_base',
+    'absl_bad_optional_access',
+    'absl_city',
+    'absl_flags_commandlineflag',
+    'absl_flags_commandlineflag_internal',
+    'absl_flags_config',
+    'absl_flags_internal',
+    'absl_flags_marshalling',
+    'absl_flags_parse',
+    'absl_flags_private_handle_accessor',
+    'absl_flags_program_name',
+    'absl_flags_reflection',
+    'absl_flags_usage',
+    'absl_flags_usage_internal',
+    'absl_hash',
+    'absl_int128',
+    'absl_malloc_internal',
+    'absl_raw_logging_internal',
+    'absl_spinlock_wait',
+    'absl_stacktrace',
+    'absl_str_format_internal',
+    'absl_strings',
+    'absl_symbolize',
+    'absl_synchronization',
+    'absl_throw_delegate',
+    'absl_time',
+    'absl_time_zone',
+  ]
+  absl_dep = []
+  foreach l : absl_libs
+    absl_dep += cpp.find_library(l, required : false)
+  endforeach
+endif
+
 if ['darwin', 'ios'].contains(host_system)
   os_cflags = ['-DWEBRTC_MAC']
   if host_system == 'ios'


=====================================
webrtc/rtc_base/system/warn_current_thread_is_deadlocked.h
=====================================
@@ -14,7 +14,11 @@
 namespace webrtc {
 
 #if defined(WEBRTC_ANDROID) && !defined(WEBRTC_CHROMIUM_BUILD)
+/* webrtc-audio-processing:
+ * We don't support the Android SDK integration for this, so stub out
 void WarnThatTheCurrentThreadIsProbablyDeadlocked();
+ */
+inline void WarnThatTheCurrentThreadIsProbablyDeadlocked() {}
 #else
 inline void WarnThatTheCurrentThreadIsProbablyDeadlocked() {}
 #endif



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/8ac052ad6ffd5ba1328c44160ec6571dfd9b930d...e74894baebe0bba7a7fe37ae0a46a2e9b1b2e021

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/compare/8ac052ad6ffd5ba1328c44160ec6571dfd9b930d...e74894baebe0bba7a7fe37ae0a46a2e9b1b2e021
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20210617/a8665694/attachment-0001.htm>