wip

alexcrichton · May 12, 2024 · 82e55fc · 82e55fc
1 parent 576e7de
commit 82e55fc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/.github/actions/android-ndk/action.yml b/.github/actions/android-ndk/action.yml
@@ -2,33 +2,42 @@ name: 'Install Android SDK'
 description: 'Install the android SDK'
 
 inputs:
-  cargo-ndk:
-    description: 'Version of Cargo NDK to install'
-    required: false
-    default: '3.5.4'
-  android-target:
+  target:
     description: 'Android target to activate'
     required: true
+  android-platform:
+    description: 'SOMETHING'
+    required: false
+    default: '26'
 
 runs:
   using: composite
   steps:
     - run: find $ANDROID_NDK
       shell: bash
-    - name: Set Up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Setup Android SDK
-      uses: android-actions/setup-android@v3
-    - uses: actions/cache@v4
-      with:
-        path: ${{ runner.tool_cache }}/cargo-ndk
-        key: cargo-ndk-bin-${{ inputs.cargo-ndk }}
-    - run: echo "${{ runner.tool_cache }}/cargo-ndk/bin" >> $GITHUB_PATH
-      shell: bash
-    - run: cargo install --root ${{ runner.tool_cache }}/cargo-ndk --version ${{ inputs.cargo-ndk }} cargo-ndk --locked
-      shell: bash
-    - run: cargo ndk-env -t ${{ inputs.android-target }} --json | jq -r 'to_entries[] | [.key, .value] | @tsv' | sed 's/\t/=/' | grep -v LINKER >> $GITHUB_ENV
-      shell: bash
+    - run: |
+        rust=${{ inputs.target }}
+        which=$ANDROID_NDK/ndk-which
+        upcase=$(echo $rust | awk '{ print toupper($0) }' | sed 's/-/_/g')
+        linker=`$which ${rust}${{ inputs.android-platform }}-clang`
+        echo CARGO_TARGET_${upcase}_LINKER=$linker >> $GITHUB_ENV
+        echo CC_${rust}=$linker >> $GITHUB_ENV
+        echo RANLIB_${rust}=`which llvm-ranlib` >> $GITHUB_ENV
+        echo AR_${rust}=`which llvm-ar` >> $GITHUB_ENV
+    # - name: Set Up JDK 17
+    #   uses: actions/setup-java@v4
+    #   with:
+    #     java-version: '17'
+    #     distribution: 'temurin'
+    # - name: Setup Android SDK
+    #   uses: android-actions/setup-android@v3
+    # - uses: actions/cache@v4
+    #   with:
+    #     path: ${{ runner.tool_cache }}/cargo-ndk
+    #     key: cargo-ndk-bin-${{ inputs.cargo-ndk }}
+    # - run: echo "${{ runner.tool_cache }}/cargo-ndk/bin" >> $GITHUB_PATH
+    #   shell: bash
+    # - run: cargo install --root ${{ runner.tool_cache }}/cargo-ndk --version ${{ inputs.cargo-ndk }} cargo-ndk --locked
+    #   shell: bash
+    # - run: cargo ndk-env -t ${{ inputs.android-target }} --json | jq -r 'to_entries[] | [.key, .value] | @tsv' | sed 's/\t/=/' | grep -v LINKER >> $GITHUB_ENV
+    #   shell: bash
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -900,7 +900,7 @@ jobs:
     - uses: ./.github/actions/android-ndk
       if: matrix.android-target != ''
       with:
-        android-target: ${{ matrix.android-target }}
+        target: ${{ matrix.target }}
 
 
     - run: $CENTOS ./ci/build-release-artifacts.sh "${{ matrix.build }}" "${{ matrix.target }}"