yeah fix shit

This commit is contained in:
2026-03-20 22:03:41 +03:00
parent 1ff91505d8
commit b2707cc35d

View File

@@ -112,11 +112,10 @@ jobs:
env: env:
ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk
# ANDROID_NDK_PATH: ${{ env.ANDROID_NDK_PATH }} ANDROID_NDK_PATH: ${{ github.workspace }}/android-ndk-r14b
ANDROID_PLATFORM_API: 36 ANDROID_PLATFORM_API: 36
ANDROID_BUILD_TOOLS_VERSION: 36.0.0 ANDROID_BUILD_TOOLS_VERSION: 36.0.0
ADB: /bin/true ADB: /bin/true
# JAVA_HOME: ${{ env.JAVA_HOME }}
# build.sh reads MATRIX_ABI to decide which ABI to build when no --abi flag is passed # build.sh reads MATRIX_ABI to decide which ABI to build when no --abi flag is passed
MATRIX_ABI: ${{ matrix.abi }} MATRIX_ABI: ${{ matrix.abi }}
@@ -128,7 +127,7 @@ jobs:
id: cache-android-tools id: cache-android-tools
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ${{ github.workspace }}/android-sdk/cmdline-tools path: ${{ env.ANDROID_SDK_ROOT }}/cmdline-tools
key: android-cmdline-tools-v36 key: android-cmdline-tools-v36
- name: Setup Android command line tools - name: Setup Android command line tools
@@ -153,11 +152,10 @@ jobs:
- name: Install Android NDK r14b - name: Install Android NDK r14b
if: steps.cache-android-ndk.outputs.cache-hit != 'true' if: steps.cache-android-ndk.outputs.cache-hit != 'true'
run: | run: |
if [ ! -d "$GITHUB_WORKSPACE/android-ndk-r14b" ]; then if [ ! -d "$ANDROID_NDK_PATH" ]; then
curl -L -o ndk.zip "https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip" curl -L -o ndk.zip "https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip"
unzip -q ndk.zip -d "$GITHUB_WORKSPACE" unzip -q ndk.zip -d "$GITHUB_WORKSPACE"
fi fi
echo "ANDROID_NDK_PATH=$GITHUB_WORKSPACE/android-ndk-r14b" >> $GITHUB_ENV
- name: Install system prerequisites - name: Install system prerequisites
run: | run: |