From cb9c2b693e796692537f0dc21fed6e1afe237a0c Mon Sep 17 00:00:00 2001
From: Dmytro Bogovych <dmytro.bogovych@gmail.com>
Date: Mon, 2 Aug 2021 15:54:55 +0300
Subject: [PATCH] - android audio subsystem - initial implementation with oboe
 library

---
 src/CMakeLists.txt                   | 7 +++++--
 src/engine/audio/Audio_Android.h     | 1 -
 src/engine/audio/Audio_Interface.cpp | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8a640e15..444d1c7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,7 +87,10 @@ if (CMAKE_SYSTEM MATCHES "Darwin*")
 endif()
 
 if (CMAKE_SYSTEM MATCHES "Android")
-    find_package (oboe REQUIRED CONFIG)
+    message("Adding the Oboe library")
+    set (OBOE_DIR libs/oboe)
+    add_subdirectory (${OBOE_DIR} ./oboe)
+    include_directories (${OBOE_DIR}/include)
 endif()
 
 if (USE_AQUA_LIB)
@@ -212,7 +215,7 @@ target_link_libraries(rtphone
     uuid
     ${OPENSSL_SSL}
     ${OPENSSL_CRYPTO}
-    ${LIBS} oboe::oboe)
+    ${LIBS} oboe)
 
 
 target_include_directories(rtphone
diff --git a/src/engine/audio/Audio_Android.h b/src/engine/audio/Audio_Android.h
index 35ab5cc4..f1543efb 100644
--- a/src/engine/audio/Audio_Android.h
+++ b/src/engine/audio/Audio_Android.h
@@ -25,7 +25,6 @@
 
 namespace Audio
 {
-
     class AndroidEnumerator: public Enumerator
     {
     public:
diff --git a/src/engine/audio/Audio_Interface.cpp b/src/engine/audio/Audio_Interface.cpp
index e1844c95..3d0abf72 100644
--- a/src/engine/audio/Audio_Interface.cpp
+++ b/src/engine/audio/Audio_Interface.cpp
@@ -146,7 +146,8 @@ OsEngine* OsEngine::instance()
 #endif
 
 #ifdef TARGET_ANDROID
-    return &OpenSLEngine::instance();
+    return nullptr; // As we use Oboe library for now
+    //return &OpenSLEngine::instance();
 #endif
 
     return nullptr;