Merge pull request #4 from rib/aa-release-0.4.2

Update all of the examples

Author: rib

.github/workflows/ci.yml

@@ -2,23 +2,22 @@ name: ci
 
 on:
   push:
-    branches: [main]
   pull_request:
 
 env:
   CARGO_INCREMENTAL: 0
   RUSTFLAGS: "-C debuginfo=0 --deny warnings"
   RUSTDOCFLAGS: -Dwarnings
-
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         rust_version: [stable]
+        cargo_ndk_args: [-t arm64-v8a -t armeabi-v7a -t x86_64 -t x86 -o app/src/main/jniLibs/]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: hecrj/setup-rust-action@v1
         with:
@@ -49,50 +48,110 @@ jobs:
         # a shared target to speed up builds of all examples
         run: mkdir shared-target
 
+      - name: Build na-mainloop example
+        working-directory: na-mainloop
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
       - name: Build agdk-mainloop example
         working-directory: agdk-mainloop
         run: >
-          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
-          -t arm64-v8a
-          -t armeabi-v7a
-          -t x86_64
-          -t x86
-          -o app/src/main/jniLibs/ -- build
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
 
-      - name: Build na-mainloop example
-        working-directory: na-mainloop
+      - name: Build na-subclass-jni
+        working-directory: na-subclass-jni
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build na-winit-wgpu
+        working-directory: na-winit-wgpu
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build na-winit-glutin
+        working-directory: na-winit-glutin
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build agdk-winit-glutin
+        working-directory: na-winit-glutin
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build agdk-cpal
+        working-directory: agdk-cpal
         run: >
-          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
-          -t arm64-v8a
-          -t armeabi-v7a
-          -t x86_64
-          -t x86
-          -o app/src/main/jniLibs/ -- build
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build agdk-oboe
+        working-directory: agdk-oboe
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      - name: Build na-egui example
+        working-directory: na-egui
+        run: >
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
 
       - name: Build agdk-egui example
         working-directory: agdk-egui
         run: >
-          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
-          -t arm64-v8a
-          -t armeabi-v7a
-          -t x86_64
-          -t x86
-          -o app/src/main/jniLibs/ -- build
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
 
       - name: Build agdk-eframe example
         working-directory: agdk-eframe
         run: >
-          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk
-          -t arm64-v8a
-          -t armeabi-v7a
-          -t x86_64
-          -t x86
-          -o app/src/main/jniLibs/ -- build
+          CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+          ./gradlew build &&
+          find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      # We don't currently build the OpenXR examples on Android because I
+      # haven't found a nice nice way to pull in libopenxr_loader binaries that
+      # we can link against. Normally I would use the binaries as part of the
+      # Oculus SDK
+      #
+      # TODO: maybe we can look at using the 'prefab' `.aar`s from Khronos here:
+      # https://search.maven.org/artifact/org.khronos.openxr/openxr_loader_for_android
+      #
+      #- name: Build na-openxr-info example
+      #  working-directory: na-openxr-info
+      #  run: >
+      #    CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build --features=android &&
+      #    ./gradlew build &&
+      #    find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
+      #- name: Build na-openxr-wgpu
+      #  working-directory: na-openxr-wgpu
+      #  run: >
+      #    CARGO_TARGET_DIR=$GITHUB_WORKSPACE/shared-target cargo ndk ${{ matrix.cargo_ndk_args }} build &&
+      #    ./gradlew build &&
+      #    find $GITHUB_WORKSPACE/shared-target -iname '*.so' -exec rm {} \;
+
 
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: actions-rs/toolchain@v1
         with:

agdk-cpal/.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures