From 26e73658f39725542fba554a9e067a3719708992 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 9 Jun 2022 12:24:10 -0700 Subject: [PATCH 1/2] Use NDK r21e (installed by prereqs script) for Android builds. --- .github/workflows/android.yml | 2 ++ .github/workflows/integration_tests.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4319f65af6..6f1f459013 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -122,6 +122,8 @@ jobs: shell: bash run: | build_scripts/android/install_prereqs.sh + echo NDK_ROOT=/tmp/android-ndk-r21e >> $GITHUB_ENV + echo ANDROID_NDK_HOME=/tmp/android-ndk-r21e >> $GITHUB_ENV - name: Add strings.exe to PATH (Windows only) if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 787031e30f..ba6e4f68a1 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -458,6 +458,8 @@ jobs: shell: bash command: | build_scripts/android/install_prereqs.sh + echo NDK_ROOT=/tmp/android-ndk-r21e >> $GITHUB_ENV + echo ANDROID_NDK_HOME=/tmp/android-ndk-r21e >> $GITHUB_ENV pip install -r scripts/gha/requirements.txt python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}" - name: Fetch prebuilt packaged SDK from previous run From 73f3334a22ab5fca5791eb7b7bb89aa8704fc1b3 Mon Sep 17 00:00:00 2001 From: Jon Simantov Date: Thu, 9 Jun 2022 12:25:44 -0700 Subject: [PATCH 2/2] Add quotes --- .github/workflows/android.yml | 4 ++-- .github/workflows/integration_tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6f1f459013..b95c66118e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -122,8 +122,8 @@ jobs: shell: bash run: | build_scripts/android/install_prereqs.sh - echo NDK_ROOT=/tmp/android-ndk-r21e >> $GITHUB_ENV - echo ANDROID_NDK_HOME=/tmp/android-ndk-r21e >> $GITHUB_ENV + echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV + echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV - name: Add strings.exe to PATH (Windows only) if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ba6e4f68a1..bd28a59d81 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -458,8 +458,8 @@ jobs: shell: bash command: | build_scripts/android/install_prereqs.sh - echo NDK_ROOT=/tmp/android-ndk-r21e >> $GITHUB_ENV - echo ANDROID_NDK_HOME=/tmp/android-ndk-r21e >> $GITHUB_ENV + echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV + echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV pip install -r scripts/gha/requirements.txt python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}" - name: Fetch prebuilt packaged SDK from previous run