Skip to content

Commit 8bd9fda

Browse files
a-mauricea-maurice
authored
Merge 55b8719 into 2d0d46f 
2 parents 2d0d46f + 55b8719 commit 8bd9fda

File tree

7 files changed

+32
-27
lines changed

7 files changed

+32
-27
lines changed

‎.github/workflows/android.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,26 +98,26 @@ jobs:
9898
id: cache_ndk
9999
uses: actions/cache@v3
100100
with:
101-
path: /tmp/android-ndk-r21e
102-
key: android-ndk-${{ matrix.os }}-r21e
101+
path: /tmp/android-ndk-r23c
102+
key: android-ndk-${{ matrix.os }}-r23c
103103

104104
- name: Check cached NDK
105105
shell: bash
106106
if: steps.cache_ndk.outputs.cache-hit != 'true'
107107
run: |
108108
# If the NDK failed to download from the cache, but there is a
109-
# /tmp/android-ndk-r21e directory, it's incomplete, so remove it.
110-
if [[ -d "/tmp/android-ndk-r21e" ]]; then
109+
# /tmp/android-ndk-r23c directory, it's incomplete, so remove it.
110+
if [[ -d "/tmp/android-ndk-r23c" ]]; then
111111
echo "Removing incomplete download of NDK"
112-
rm -rf /tmp/android-ndk-r21e
112+
rm -rf /tmp/android-ndk-r23c
113113
fi
114114
115115
- name: Install prerequisites
116116
shell: bash
117117
run: |
118118
build_scripts/android/install_prereqs.sh
119-
echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV
120-
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
119+
echo "NDK_ROOT=/tmp/android-ndk-r23c" >> $GITHUB_ENV
120+
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r23c" >> $GITHUB_ENV
121121
122122
- name: Add strings.exe to PATH (Windows only)
123123
if: startsWith(matrix.os, 'windows')

‎.github/workflows/cpp-packaging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ jobs:
267267
id: cache_ndk
268268
uses: actions/cache@v3
269269
with:
270-
path: /tmp/android-ndk-r21e
271-
key: android-ndk-${{ runner.os }}-r21e
270+
path: /tmp/android-ndk-r23c
271+
key: android-ndk-${{ runner.os }}-r23c
272272

273273
- name: install prerequisites
274274
run: sdk-src/build_scripts/android/install_prereqs.sh

‎.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ jobs:
436436
id: cache_ndk
437437
uses: actions/cache@v3
438438
with:
439-
path: /tmp/android-ndk-r21e
440-
key: android-ndk-${{ matrix.os }}-r21e
439+
path: /tmp/android-ndk-r23c
440+
key: android-ndk-${{ matrix.os }}-r23c
441441
- name: Setup python
442442
uses: actions/setup-python@v4
443443
with:

‎build_scripts/android/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ absbuildpath=$( pwd -P )
2727
cd "${origpath}"
2828

2929
# If NDK_ROOT is not set or is the wrong version, use to the version in /tmp.
30-
if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 21\." "${NDK_ROOT}/source.properties") ]]; then
31-
if [[ ! -d /tmp/android-ndk-r21e ]]; then
32-
echo "Recommended NDK version r21e not present in /tmp."
30+
if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 23\." "${NDK_ROOT}/source.properties") ]]; then
31+
if [[ ! -d /tmp/android-ndk-r23c ]]; then
32+
echo "Recommended NDK version r23c not present in /tmp."
3333
echo "Please run install_prereqs.sh if you wish to use the recommended NDK version."
3434
echo "Continuing with default NDK..."
3535
sleep 2
3636
fi
37-
export NDK_ROOT=/tmp/android-ndk-r21e
38-
export ANDROID_NDK_HOME=/tmp/android-ndk-r21e
37+
export NDK_ROOT=/tmp/android-ndk-r23c
38+
export ANDROID_NDK_HOME=/tmp/android-ndk-r23c
3939
fi
4040
cd "${sourcepath}"
4141
set +e

‎build_scripts/android/install_prereqs.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ if [[ -z "${ANDROID_HOME}" ]]; then
6060
exit 1
6161
fi
6262

63-
if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 21\." "${NDK_ROOT}/source.properties") ]]; then
64-
if [[ -d /tmp/android-ndk-r21e && \
65-
-n $(grep "Pkg\.Revision = 21\." "/tmp/android-ndk-r21e/source.properties") ]]; then
66-
echo "Using NDK r21e in /tmp/android-ndk-r21e".
63+
if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 23\." "${NDK_ROOT}/source.properties") ]]; then
64+
if [[ -d /tmp/android-ndk-r23c && \
65+
-n $(grep "Pkg\.Revision = 23\." "/tmp/android-ndk-r23c/source.properties") ]]; then
66+
echo "Using NDK r23c in /tmp/android-ndk-r23c".
6767
else
6868
echo "NDK_ROOT environment variable is not set, or NDK version is incorrect."
69-
echo "This build recommends NDK r21e, downloading..."
69+
echo "This build recommends NDK r23c, downloading..."
7070
if [[ -z $(which curl) ]]; then
7171
echo "Error, could not run 'curl' to download NDK. Is it in your PATH?"
7272
exit 1
@@ -77,12 +77,12 @@ if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 21\." "${NDK_ROOT}/source.p
7777
for retry in {1..10} error; do
7878
if [[ $retry == "error" ]]; then exit 5; fi
7979
curl --http1.1 -LSs \
80-
"https://dl.google.com/android/repository/android-ndk-r21e-${platform}-x86_64.zip" \
81-
--output /tmp/android-ndk-r21e.zip && break
80+
"https://dl.google.com/android/repository/android-ndk-r23c-${platform}.zip" \
81+
--output /tmp/android-ndk-r23c.zip && break
8282
sleep 300
8383
done
8484
set -e
85-
(cd /tmp && unzip -oq android-ndk-r21e.zip && rm -f android-ndk-r21e.zip)
86-
echo "NDK r21e has been downloaded into /tmp/android-ndk-r21e"
85+
(cd /tmp && unzip -oq android-ndk-r23c.zip && rm -f android-ndk-r23c.zip)
86+
echo "NDK r23c has been downloaded into /tmp/android-ndk-r23c"
8787
fi
8888
fi

‎release_build_files/readme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,11 @@ workflow use only during the development of your app, not for publicly shipping
631631
code.
632632

633633
## Release Notes
634+
### Upcoming
635+
- Changes
636+
- GGeneral (Android): Firebase C++ on Android is now built against NDK
637+
version r23c.
638+
634639
### 12.6.0
635640
- Changes
636641
- General (iOS): Update to Firebase Cocoapods version 11.8.1.

‎scripts/gha/install_test_workflow_prereqs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ fi
7474

7575
if [[ "${TEST_ONLY}" == "" ]]; then
7676
if [[ "${PLATFORM}" == "Android" ]]; then
77-
echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV
78-
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
77+
echo "NDK_ROOT=/tmp/android-ndk-r23c" >> $GITHUB_ENV
78+
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r23c" >> $GITHUB_ENV
7979
build_scripts/android/install_prereqs.sh
8080
elif [[ "${PLATFORM}" == "iOS" ]]; then
8181
build_scripts/ios/install_prereqs.sh

0 commit comments

Comments
 (0)