Remove split subdirectories as part of rust-mobile#372 modularization (…

…rust-mobile#374) * ndk-examples: port to use android-activity * Removes ndk-glue + ndk-macro as part of rust-mobile#372 modularization The ndk-glue and ndk-macro subdirectores have been split into a stand-alone repository at: https://github.com/rust-mobile/ndk-glue This is being done as part of the modularization effort described in issue rust-mobile#372 The stand-alone repository was filtered like this: ``` git clone https://github.com/newren/git-filter-repo git clone https://github.com/rust-windowing/android-ndk-rs.git ndk-glue cd ndk-glue py ../git-filter-repo/git-filter-repo \ --path ndk-glue --path ndk-macro \ --path ndk-examples --path-rename ndk-examples:examples \ --path LICENSE-APACHE --path LICENSE-MIT \ --path Cargo.toml --path rustfmt.toml \ --path .github --path .gitignore ``` The last commit in this repo that is included within the stand-alone repository is 107f03e Although ndk-glue is also being deprecated at the same time as splitting it out this commit doesn't make any README changes for this repo yet which will be addressed separately. * Removes ndk-context as part of rust-mobile#372 modularization The ndk-context subdirectory has been split into a stand-alone repository at: https://github.com/rust-mobile/ndk-context This is being done as part of the modularization effort described in issue rust-mobile#372 The stand-alone repository was filtered like this: ``` git clone https://github.com/newren/git-filter-repo git clone https://github.com/rust-windowing/android-ndk-rs.git ndk-glue cd ndk-glue py ../git-filter-repo/git-filter-repo \ --path ndk-context \ --path ndk-examples --path-rename ndk-examples:examples \ --path LICENSE-APACHE --path LICENSE-MIT \ --path Cargo.toml --path rustfmt.toml \ --path .github --path .gitignore ``` The last commit in this repo that is included within the stand-alone repository is 107f03e * Removes cargo-apk, ndk-build + ndk-examples as part of rust-mobile#372 modularization The cargo-apk, ndk-build + ndk-examples subdirectores have been split into a stand-alone repository at: https://github.com/rust-mobile/cargo-apk This is being done as part of the modularization effort described in issue rust-mobile#372 The stand-alone repository was filtered like this: ``` git clone https://github.com/newren/git-filter-repo git clone https://github.com/rust-windowing/android-ndk-rs.git ndk-glue cd ndk-glue py ../git-filter-repo/git-filter-repo \ --path cargo-apk --path ndk-build \ --path ndk-examples --path-rename ndk-examples:examples \ --path LICENSE-APACHE --path LICENSE-MIT \ --path Cargo.toml --path rustfmt.toml \ --path .github --path .gitignore ``` The last commit in this repo that is included within the stand-alone repository is 9b4dbfa The CI for this repo is considerably simpler now that the examples have been moved to the `cargo-apk` repository since it now just checks that the `ndk` and `ndk-sys` crates successfully cross compile without running a hello_world example under an emulator. Runtime tests could be re-added in the future, but especially while there is no significant test coverage from the examples it's more valuable to keep those for testing `cargo-apk` packaging and simplify testing in this repo.
forkgull · Dec 21, 2022 · ce1e652 · ce1e652
1 parent c47e6c3
commit ce1e652
Show file tree

Hide file tree

Showing 43 changed files with 19 additions and 5,009 deletions.
diff --git a/.github/workflows/android_test.sh b/.github/workflows/android_test.sh
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,11 +16,6 @@ jobs:
         crate:
           - { name: "ndk-sys", target: "armv7-linux-androideabi" }
           - { name: "ndk", target: "armv7-linux-androideabi" }
-          - { name: "ndk-macro", target: "x86_64-unknown-linux-gnu" }
-          - { name: "ndk-context", target: "armv7-linux-androideabi" }
-          - { name: "ndk-glue", target: "armv7-linux-androideabi" }
-          - { name: "ndk-build", target: "x86_64-unknown-linux-gnu" }
-          - { name: "cargo-apk", target: "x86_64-unknown-linux-gnu" }
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,10 +30,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: clippy
-        # Use one of our supported targets to lint all crates including
-        # the target-specific `ndk` in one go.
-        # This assumes our host-tools (cargo-apk and dependencies)
-        # also compile cleanly under this target.
+        # Use a cross-compilation target (that's typical for Android) to lint everything
         args: --all --all-targets --all-features --target aarch64-linux-android -- -Dwarnings
 
   check_msrv:
@@ -47,7 +44,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: check
-          # See comment above about using one of our supported targets.
+          # Use a cross-compilation target (that's typical for Android) to lint everything
           args: --workspace --all-targets --all-features --target aarch64-linux-android
 
   build:
@@ -57,123 +54,39 @@ jobs:
         os:  [ubuntu-latest]
         rust-channel: ['stable', 'nightly']
         rust-target:
-          - 'armv7-linux-androideabi'
-          - 'aarch64-linux-android'
-          - 'i686-linux-android'
-          - 'x86_64-linux-android'
+          - { triple: 'armv7-linux-androideabi', abi: armeabi-v7a }
+          - { triple: 'aarch64-linux-android', abi: arm64-v8a }
+          - { triple: 'i686-linux-android', abi: x86 }
+          - { triple: 'x86_64-linux-android', abi: x86_64 }
         include:
           - os: windows-latest
             rust-channel: 'stable'
-            rust-target: 'aarch64-linux-android'
+            rust-target: { triple: 'aarch64-linux-android', abi: arm64-v8a }
           - os: windows-latest
             rust-channel: 'stable'
-            rust-target: 'x86_64-linux-android'
+            rust-target: { triple: 'x86_64-linux-android', abi: x86_64 }
 
     runs-on: ${{ matrix.os }}
-    name: Build apk
+    name: Cross-compile
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Installing Rust ${{ matrix.rust-channel }} w/ ${{ matrix.rust-target }}
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v2
+
+    - name: Install cargo-ndk
+      run: cargo install cargo-ndk
+
+    - name: Installing Rust ${{ matrix.rust-channel }} w/ ${{ matrix.rust-target.triple }}
       uses: actions-rs/toolchain@v1
       with:
         toolchain: ${{ matrix.rust-channel }}
-        target: ${{ matrix.rust-target }}
+        target: ${{ matrix.rust-target.triple }}
         override: true
 
-    - name: Install cargo-apk
-      run:
-        cargo install --path cargo-apk
-
-    - name: Cargo check for target ${{ matrix.rust-target }}
-      run: cargo check -p ndk --target ${{ matrix.rust-target }} --all-features
-
-    - name: Cargo apk build for target ${{ matrix.rust-target }}
-      run: cargo apk build -p ndk-examples --target ${{ matrix.rust-target }} --examples
-
-    - uses: actions/upload-artifact@v2
-      # Only need this for CI, unless users are interested in downloading
-      # a ready-made app that does nothing but printing "hello world".
-      if: ${{ matrix.rust-target == 'x86_64-linux-android' }}
-      name: Upload hello_world apk
-      with:
-        name: hello_world_${{ matrix.os }}_${{ matrix.rust-target }}
-        path: ./target/debug/apk/examples/hello_world.apk
-
-  android_emulator:
-    name: hello_world example on emulator
-    needs: build
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        source_os: [ubuntu-latest, windows-latest, local]
-    env:
-      api-level: 29
-      emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-      arch: x86_64
-      # the `googleapis` emulator target is considerably slower on CI.
-      target: default
-      profile: Nexus 6
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-
-    - uses: actions/download-artifact@v2
-      name: Download hello_world APK
-      if: ${{ matrix.source_os != 'local' }}
-      id: download
-      with:
-        name: hello_world_${{ matrix.source_os }}_x86_64-linux-android
-
-    - name: Install `cargo-apk` and add `x86_64-linux-android` target
-      if: ${{ matrix.source_os == 'local' }}
-      run: |
-        cargo install --path cargo-apk
-        rustup target add x86_64-linux-android
-
-    - name: AVD cache
-      uses: actions/cache@v2
-      id: avd-cache
-      with:
-        path: |
-          ~/.android/avd/*
-          ~/.android/adb*
-        # Bump the trailing number when making changes to the emulator setup below
-        key: avd-${{ env.api-level }}-1
-
-    - name: create AVD and generate snapshot for caching
-      if: steps.avd-cache.outputs.cache-hit != 'true'
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ env.api-level }}
-        arch: ${{ env.arch }}
-        target: ${{ env.target }}
-        profile: ${{ env.profile }}
-        emulator-options: ${{ env.emulator-options }}
-        disable-animations: true
-        force-avd-creation: false
-        script: echo "Generated AVD snapshot for caching."
-
-    - name: Start hello_world example
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ env.api-level }}
-        arch: ${{ env.arch }}
-        target: ${{ env.target }}
-        profile: ${{ env.profile }}
-        emulator-options: -no-snapshot-save ${{ env.emulator-options }}
-        disable-animations: true
-        force-avd-creation: false
-        script: ./.github/workflows/android_test.sh "${{ steps.download.outputs.download-path }}"
-
-    - name: Upload emulator logs
-      uses: actions/upload-artifact@v2
-      if: ${{ always() }}
-      with:
-        name: log
-        path: ~/logcat.log
+    - name: Compile for ${{ matrix.rust-target.triple }}
+      run: cargo ndk -t ${{ matrix.rust-target.abi }} build
 
   build-host:
     strategy:
@@ -202,22 +115,6 @@ jobs:
       run:
         cargo test -p ndk --all-features
 
-    - name: Test ndk-build
-      run:
-        cargo test -p ndk-build --all-features
-
-    - name: Test ndk-glue
-      run:
-        cargo test -p ndk-glue --all-features
-
-    - name: Test ndk-macro
-      run:
-        cargo test -p ndk-macro --all-features
-
-    - name: Test cargo-apk
-      run:
-        cargo test -p cargo-apk --all-features
-
   docs:
     strategy:
       fail-fast: false

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,11 +1,5 @@
 [workspace]
 members = [
     "ndk",
-    "ndk-context",
-    "ndk-macro",
-    "ndk-build",
-    "ndk-examples",
-    "ndk-glue",
     "ndk-sys",
-    "cargo-apk",
 ]
diff --git a/cargo-apk/CHANGELOG.md b/cargo-apk/CHANGELOG.md
diff --git a/cargo-apk/Cargo.toml b/cargo-apk/Cargo.toml