Revert "Migrate from "oboe" to "ndk::audio" (RustAudio#961)"

This reverts commit c5a163e.

Author: jonatino

.github/workflows/cpal.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Run clippy
       run: cargo clippy --all --all-features
     - name: Run clippy for Android target
-      run: cargo clippy --all --features asio --target armv7-linux-androideabi
+      run: cargo clippy --all --features asio --features oboe/fetch-prebuilt --target armv7-linux-androideabi
 
   rustfmt-check:
     runs-on: ubuntu-latest
@@ -207,16 +207,15 @@ jobs:
       with:
         target: armv7-linux-androideabi
     - name: Check android
-      working-directory: examples/android
-      run: cargo check --target armv7-linux-androideabi --verbose
+      run: cargo check --example android --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
     - name: Check beep
-      run: cargo check --example beep --target armv7-linux-androideabi --verbose
+      run: cargo check --example beep --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
     - name: Check enumerate
-      run: cargo check --example enumerate --target armv7-linux-androideabi --verbose
+      run: cargo check --example enumerate --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
     - name: Check feedback
-      run: cargo check --example feedback --target armv7-linux-androideabi --verbose
+      run: cargo check --example feedback --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
     - name: Check record_wav
-      run: cargo check --example record_wav --target armv7-linux-androideabi --verbose
+      run: cargo check --example record_wav --target armv7-linux-androideabi --features oboe/fetch-prebuilt --verbose
 
   android-apk-build:
     runs-on: ubuntu-latest
@@ -228,12 +227,11 @@ jobs:
         targets: armv7-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android
     - name: Set Up Android tools
       run: |
-        ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "build-tools;30.0.2" "platforms;android-30"
+        ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT --install "platforms;android-30"
     - name: Install Cargo APK
       run: cargo install cargo-apk
     - name: Build APK
-      working-directory: examples/android
-      run: cargo apk build
+      run: cargo apk build --example android
 
   ios-build:
     runs-on: macOS-latest

Cargo.toml

@@ -11,6 +11,7 @@ rust-version = "1.70"
 
 [features]
 asio = ["asio-sys", "num-traits"] # Only available on Windows. See README for setup instructions.
+oboe-shared-stdcxx = ["oboe/shared-stdcxx"] # Only available on Android. See README for what it does.
 
 # Deprecated, the `oboe` backend has been removed
 oboe-shared-stdcxx = []
@@ -24,6 +25,9 @@ hound = "3.5"
 ringbuf = "0.4.1"
 clap = { version = "4.0", features = ["derive"] }
 
+[target.'cfg(target_os = "android")'.dev-dependencies]
+ndk-glue = "0.7"
+
 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.54.0", features = [
     "Win32_Media_Audio",
@@ -83,11 +87,15 @@ js-sys = { version = "0.3.35" }
 web-sys = { version = "0.3.35", features = [ "AudioContext", "AudioContextOptions", "AudioBuffer", "AudioBufferSourceNode", "AudioNode",  "AudioDestinationNode", "Window", "AudioContextState"] }
 
 [target.'cfg(target_os = "android")'.dependencies]
-ndk = { version = "0.9", default-features = false, features = ["audio", "api-level-26"]}
+oboe = { version = "0.6", features = [ "java-interface" ] }
+ndk = { version = "0.8", default-features = false }
 ndk-context = "0.1"
 jni = "0.21"
-num-derive = "0.4"
-num-traits = "0.2"
+
+[[example]]
+name = "android"
+path = "examples/android.rs"
+crate-type = ["cdylib"]
 
 [[example]]
 name = "beep"

README.md

@@ -20,7 +20,7 @@ Currently, supported hosts include:
 - Windows (via WASAPI by default, see ASIO instructions below)
 - macOS (via CoreAudio)
 - iOS (via CoreAudio)
-- Android (via AAudio)
+- Android (via Oboe)
 - Emscripten
 
 Note that on Linux, the ALSA development files are required. These are provided
@@ -38,6 +38,10 @@ Some audio backends are optional and will only be compiled with a [feature flag]
 - JACK (on Linux): `jack`
 - ASIO (on Windows): `asio`
 
+Oboe can either use a shared or static runtime. The static runtime is used by default, but activating the
+`oboe-shared-stdcxx` feature makes it use the shared runtime, which requires `libc++_shared.so` from the Android NDK to
+be present during execution.
+
 ## ASIO on Windows
 
 [ASIO](https://en.wikipedia.org/wiki/Audio_Stream_Input/Output) is an audio