Added required changes for AAudio

builders/ms2plugins.cmake

@@ -50,3 +50,6 @@ endif()
 if(ENABLE_VIDEO AND (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
 	lcb_dependencies("mswinrtvid")
 endif()
+if (ENABLE_AAUDIO)
+	lcb_dependencies("msaaudio")
+endif()

builders/msaaudio.cmake

+############################################################################
+# msaaudio.cmake
+# Copyright (C) 2019  Belledonne Communications, Grenoble France
+#
+############################################################################
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+############################################################################
+
+lcb_git_repository("https://gitlab.linphone.org/BC/public/msaaudio.git")
+lcb_git_tag_latest("master")
+lcb_git_tag("master")
+lcb_external_source_paths("msaaudio")
+lcb_groupable(YES)
+lcb_sanitizable(YES)
+lcb_plugin(YES)
+
+lcb_dependencies("ms2")
+lcb_cmake_options(
+        "-DENABLE_AAUDIO=${ENABLE_AAUDIO}"
+)

options/ms2.cmake

@@ -64,6 +64,7 @@ lcb_add_strict_dependent_option("MPEG4" "MPEG4 video encoding/decoding support (
 lcb_add_strict_dependent_option("OpenH264" "H.264 video encoding/decoding support with the openh264 library (require license)." OFF "ENABLE_VIDEO" OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_dependent_option("VPX" "VPX (VP8) video encoding/decoding support." "${DEFAULT_VALUE_ENABLE_VPX}" "ENABLE_VIDEO" OFF)
 lcb_add_strict_dependent_option("X264" "H.264 video encoding support with the x264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_GPL_THIRD_PARTIES;ENABLE_UNMAINTAINED" OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
+lcb_add_option("AAudio" "AAudio Android sound card for Android 8+." "${DEFAULT_VALUE_ENABLE_AAUDIO}")
 
 # Other options
 lcb_add_option("PCAP" "PCAP support." "${DEFAULT_VALUE_ENABLE_PCAP}")

toolchains/android/toolchain-android.cmake

@@ -33,7 +33,11 @@ file(READ "${CMAKE_ANDROID_NDK}/source.properties" SOURCE_PROPERTIES_CONTENT)
 string(REGEX MATCH "Pkg\\.Revision = ([0-9]+)\\." NDK_VERSION_MATCH "${SOURCE_PROPERTIES_CONTENT}")
 set(CMAKE_ANDROID_NDK_VERSION ${CMAKE_MATCH_1})
 
+if(ENABLE_AAUDIO)
+set(ANDROID_NATIVE_API_LEVEL "android-28")
+else()
 set(ANDROID_NATIVE_API_LEVEL "android-17")
+endif()
 set(ANDROID_CPP_FEATURES "rtti exceptions")
 set(ANDROID_STL "c++_shared")