From c3af29db1eeef21bcae55191b4d4ffd11b3b62b2 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 30 May 2023 15:31:47 +1000 Subject: [PATCH] build/android: remove all references to gnustl Not needed anymore with NDK R25. Part-of: --- subprojects/gst-plugins-bad/ext/soundtouch/meson.build | 6 +----- subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build | 8 ++------ subprojects/gst-plugins-bad/meson.build | 5 ----- subprojects/gst-plugins-good/ext/qt/meson.build | 3 --- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/soundtouch/meson.build b/subprojects/gst-plugins-bad/ext/soundtouch/meson.build index 1322b9edcf..83967e5833 100644 --- a/subprojects/gst-plugins-bad/ext/soundtouch/meson.build +++ b/subprojects/gst-plugins-bad/ext/soundtouch/meson.build @@ -9,10 +9,6 @@ if get_option('soundtouch').disabled() subdir_done() endif -if not gnustl_dep.found() and get_option('soundtouch').enabled() - error('soundtouch plugin enabled but could not find gnustl dep for Android c++ support') -endif - soundtouch_dep = dependency('soundtouch', required : false) if soundtouch_dep.found() soundtouch_cargs += ['-DHAVE_SOUNDTOUCH_1_4'] @@ -36,7 +32,7 @@ if soundtouch_dep.found() c_args : gst_plugins_bad_args + soundtouch_cargs, cpp_args : gst_plugins_bad_args + soundtouch_cargs, include_directories : [configinc], - dependencies : [gstaudio_dep, soundtouch_dep, gnustl_dep], + dependencies : [gstaudio_dep, soundtouch_dep], install : true, install_dir : plugins_install_dir) plugins += [gstsoundtouch] diff --git a/subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build b/subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build index 09565e27c7..d915e057c8 100644 --- a/subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build +++ b/subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build @@ -7,17 +7,13 @@ webrtc_sources = [ webrtc_dep = dependency('webrtc-audio-processing-1', version : ['>= 1.0'], required : get_option('webrtcdsp')) -if not gnustl_dep.found() and get_option('webrtcdsp').enabled() - error('webrtcdsp plugin enabled but could not find gnustl dep for Android c++ support') -endif - -if webrtc_dep.found() and gnustl_dep.found() +if webrtc_dep.found() gstwebrtcdsp = library('gstwebrtcdsp', webrtc_sources, cpp_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], - dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep], + dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep], install : true, install_dir : plugins_install_dir, override_options : ['cpp_std=c++17'], diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index e9cba0ef0b..1c99983efc 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -471,11 +471,6 @@ else endif cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled()) -gnustl_dep = declare_dependency() -if host_system == 'android' - gnustl_dep = dependency('gnustl', required : false) -endif - # Disable compiler warnings for unused variables and args if gst debug system is disabled if gst_dep.type_name() == 'internal' gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug') diff --git a/subprojects/gst-plugins-good/ext/qt/meson.build b/subprojects/gst-plugins-good/ext/qt/meson.build index 04393ca414..56f5161e2e 100644 --- a/subprojects/gst-plugins-good/ext/qt/meson.build +++ b/subprojects/gst-plugins-good/ext/qt/meson.build @@ -135,9 +135,6 @@ if host_system == 'android' optional_deps += [qt5androidextras, glesv2_dep] qt_defines += ['-DHAVE_QT_ANDROID'] have_qt_windowing = true - # Needed for C++11 support in Cerbero. People building with Android - # in some other way need to add the necessary bits themselves. - optional_deps += dependency('gnustl', required : false) endif endif endif