From 006c81ef320593bc5708d9d3d4666992d2e1e7a4 Mon Sep 17 00:00:00 2001 From: Max de Danschutter Date: Fri, 29 Jan 2021 16:57:20 +0100 Subject: [PATCH 1/3] Bump Android dependencies oboe 0.3.0 -> obeo 0.4.0 Jni 0.17.0 -> 0.18.0 --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7eeb2ce..01ece22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,10 +53,10 @@ 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] -oboe = { version = "0.3.0", features = [ "java-interface" ] } +oboe = { version = "0.4.0", features = [ "java-interface" ] } ndk = "0.2" ndk-glue = "0.2" -jni = "0.17" +jni = "0.18" [[example]] name = "android" From f660d417384c0dc3139c92fb48fa94988dd72add Mon Sep 17 00:00:00 2001 From: Max de Danschutter Date: Sat, 30 Jan 2021 12:16:49 +0100 Subject: [PATCH 2/3] Use prebuilt oboe-sys in CI --- .github/workflows/cpal.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cpal.yml b/.github/workflows/cpal.yml index 8c637b6..225c41d 100644 --- a/.github/workflows/cpal.yml +++ b/.github/workflows/cpal.yml @@ -263,15 +263,15 @@ jobs: override: true target: armv7-linux-androideabi - name: Check android - run: cargo check --example android --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 From a3ad8dd20bbfc97cf1719d5ed3814d48680ff97f Mon Sep 17 00:00:00 2001 From: Max de Danschutter Date: Sat, 30 Jan 2021 12:30:50 +0100 Subject: [PATCH 3/3] Fix clippy for Android CI --- .github/workflows/cpal.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cpal.yml b/.github/workflows/cpal.yml index 225c41d..429034e 100644 --- a/.github/workflows/cpal.yml +++ b/.github/workflows/cpal.yml @@ -29,7 +29,7 @@ jobs: uses: actions-rs/clippy-check@v1 with: token: ${{ secrets.GITHUB_TOKEN }} - args: --all --all-features --target armv7-linux-androideabi + args: --all --features asio --features oboe/fetch-prebuilt --target armv7-linux-androideabi rustfmt-check: runs-on: ubuntu-latest