Skip to content

Commit 0e77d3d

Browse files
yifanyangyifanyang
authored
Remove custom NDK installations
1 parent c455bba commit 0e77d3d

7 files changed

+0
-85
lines changed

‎.github/workflows/api-information.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ jobs:
1717
java-version: 11
1818
distribution: temurin
1919
cache: gradle
20-
- name: Set up NDK 21.4.7075529
21-
run: |
22-
ANDROID_ROOT=/usr/local/lib/android
23-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
24-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
25-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
26-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
27-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
28-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
2920
- name: Set up Python 3.10
3021
uses: actions/setup-python@v4
3122
with:

‎.github/workflows/build-src-check.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ jobs:
1414
runs-on: ubuntu-22.04
1515
steps:
1616
- uses: actions/[email protected]
17-
- name: Setup NDK
18-
run: |
19-
ANDROID_ROOT=/usr/local/lib/android
20-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
21-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
22-
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT
23-
2417
- name: Set up JDK 11
2518
uses: actions/setup-java@v2
2619
with:

‎.github/workflows/ci_tests.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ jobs:
2222
with:
2323
fetch-depth: 2
2424
submodules: true
25-
- name: Set up NDK 21.4.7075529
26-
run: |
27-
ANDROID_ROOT=/usr/local/lib/android
28-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
29-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
30-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
31-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
32-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
33-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
3425

3526
- name: Set up JDK 11
3627
uses: actions/setup-java@v2
@@ -59,15 +50,6 @@ jobs:
5950
with:
6051
fetch-depth: 2
6152
submodules: true
62-
- name: Set up NDK 21.4.7075529
63-
run: |
64-
ANDROID_ROOT=/usr/local/lib/android
65-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
66-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
67-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
68-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
69-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
70-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
7153

7254
- name: Set up JDK 11
7355
uses: actions/setup-java@v2
@@ -118,15 +100,6 @@ jobs:
118100
with:
119101
fetch-depth: 2
120102
submodules: true
121-
- name: Set up NDK 21.4.7075529
122-
run: |
123-
ANDROID_ROOT=/usr/local/lib/android
124-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
125-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
126-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
127-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
128-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
129-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
130103

131104
- name: Set up JDK 11
132105
uses: actions/setup-java@v2

‎.github/workflows/fireperf-e2e.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ jobs:
3333
java-version: 11
3434
distribution: temurin
3535
cache: gradle
36-
- name: Set up NDK 21.4.7075529
37-
run: |
38-
ANDROID_ROOT=/usr/local/lib/android
39-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
40-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
41-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
42-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
43-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
44-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
4536
- name: Set up Python 3.10
4637
uses: actions/setup-python@v4
4738
with:

‎.github/workflows/health-metrics.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@ jobs:
2121
java-version: 11
2222
distribution: temurin
2323
cache: gradle
24-
- name: Set up NDK 21.4.7075529
25-
run: |
26-
ANDROID_ROOT=/usr/local/lib/android
27-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
28-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
29-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
30-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
31-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
32-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
3324
- name: Set up Python 3.10
3425
uses: actions/setup-python@v4
3526
with:
@@ -62,15 +53,6 @@ jobs:
6253
java-version: 11
6354
distribution: temurin
6455
cache: gradle
65-
- name: Set up NDK 21.4.7075529
66-
run: |
67-
ANDROID_ROOT=/usr/local/lib/android
68-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
69-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
70-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
71-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
72-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
73-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
7456
- name: Set up Python 3.10
7557
uses: actions/setup-python@v4
7658
with:

‎.github/workflows/make-bom.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ jobs:
1212
with:
1313
python-version: '3.10'
1414
- uses: actions/[email protected]
15-
- name: Setup NDK
16-
run: |
17-
ANDROID_ROOT=/usr/local/lib/android
18-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
19-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
20-
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT
2115
- name: Set up JDK 11
2216
uses: actions/setup-java@v2
2317
with:

‎.github/workflows/smoke-tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ jobs:
1717
java-version: 11
1818
distribution: temurin
1919
cache: gradle
20-
- name: Set up NDK 21.4.7075529
21-
run: |
22-
ANDROID_ROOT=/usr/local/lib/android
23-
ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk
24-
ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk-bundle
25-
SDKMANAGER=${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager
26-
echo "y" | $SDKMANAGER "ndk;21.4.7075529"
27-
ln -sfn ${ANDROID_SDK_ROOT}/ndk/21.4.7075529 ${ANDROID_NDK_ROOT}
28-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_ROOT}" >> $GITHUB_ENV
2920
- uses: google-github-actions/auth@v0
3021
with:
3122
credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}

0 commit comments

Comments
 (0)