Add: x86_64-linux-android用のバインディングを追加 (#21)

* Add: x86_64-linux-android用のバインディングを追加 * Update: bindings.rsを更新 * Update: 1.40.0に更新 * Update: workflowを更新 * （ビルドテスト） * Fix: 構文修正 * Add: build.rsにAndroid周りの処理を追加 * Add: 存在確認を追加 * Fix: 名前を修正 * Fix: rustup target install忘れ
VOICEVOX · Apr 23, 2023 · ebb9dcb · ebb9dcb
1 parent ab89807
commit ebb9dcb
Show file tree

Hide file tree

Showing 6 changed files with 7,468 additions and 3 deletions.
diff --git a/.github/actions/auto_gen_bind_pr/action.yaml b/.github/actions/auto_gen_bind_pr/action.yaml
@@ -21,15 +21,16 @@ runs:
         sudo apt update
         sudo apt install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
     - uses: nttld/setup-ndk@v1
-      if: inputs.triple == 'aarch64-linux-android'
+      if: endsWith(inputs.triple, '-linux-android')
       with:
         ndk-version: r25b
     - name: Set path for android
-      if: inputs.triple == 'aarch64-linux-android'
+      if: endsWith(inputs.triple, '-linux-android')
       shell: bash
       run: |
         echo "$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" >> "$GITHUB_PATH"
-        echo "AR_aarch64_linux_android=llvm-ar" >> "$GITHUB_ENV"
+        UNDERSCORED_TRIPLE=$(sed 's/-/_/g' <<< "${{ inputs.triple }}")
+        echo "AR_$UNDERSCORED_TRIPLE=llvm-ar" >> "$GITHUB_ENV"
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable

diff --git a/.github/workflows/gen_bind.yaml b/.github/workflows/gen_bind.yaml
@@ -17,13 +17,17 @@ jobs:
             triple: aarch64-unknown-linux-gnu
           - os: ubuntu-latest
             triple: aarch64-linux-android
+          - os: ubuntu-latest
+            triple: x86_64-linux-android
+
           - os: windows-latest
             triple: x86_64-pc-windows-msvc
           - os: windows-latest
             triple: x86_64-pc-windows-msvc
             additional_features: directml
           - os: windows-latest
             triple: i686-pc-windows-msvc
+
           - os: macos-latest
             triple: x86_64-apple-darwin
           - os: macos-latest

diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
@@ -39,6 +39,7 @@ jobs:
       - run: rustup target install i686-pc-windows-msvc
       - run: rustup target install x86_64-pc-windows-msvc
       - run: rustup target install aarch64-linux-android
+      - run: rustup target install x86_64-linux-android
       # ******************************************************************
       - name: Download prebuilt archive (CPU, x86_64-unknown-linux-gnu)
         uses: actions-rs/cargo@v1
@@ -56,6 +57,14 @@ jobs:
       - name: Verify prebuilt archive downloaded (CPU, aarch64-linux-android)
         run: ls -lh target/aarch64-linux-android/debug/build/onnxruntime-sys-*/out/onnxruntime*.aar
       # ******************************************************************
+      - name: Download prebuilt archive (CPU, x86_64-linux-android)
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --target x86_64-linux-android
+      - name: Verify prebuilt archive downloaded (CPU, x86_64-linux-android)
+        run: ls -lh target/x86_64-linux-android/debug/build/onnxruntime-sys-*/out/onnxruntime*.aar
+      # ******************************************************************
       - name: Download prebuilt archive (CPU, x86_64-apple-darwin)
         uses: actions-rs/cargo@v1
         with:

diff --git a/onnxruntime-sys/build.rs b/onnxruntime-sys/build.rs
@@ -475,6 +475,7 @@ impl OnnxPrebuiltArchive for Triplet {
             }
             (Os::Windows, Architecture::X86, Accelerator::None)
             | (Os::MacOs, Architecture::X86_64, Accelerator::None)
+            | (Os::Android, Architecture::X86_64, Accelerator::None)
             | (Os::Android, Architecture::Arm64, Accelerator::None)
             | (Os::Linux, Architecture::Arm64, Accelerator::None) => Cow::from(format!(
                 "{}-{}",