Skip to content

Commit f3adecc

Browse files
committed
Clear ANDROID_NDK_ROOT envrionment variable due to swiftlang/swift-driver#1879
1 parent df80713 commit f3adecc

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
swiftly run swift --version
127127
swiftly run swift --version +"${SWIFT_TOOLCHAIN_VERSION}"
128128
129-
- name: Install Android NDK
129+
- name: Setup Android NDK
130130
run: |
131131
# Only install the NDK if it is overridden
132132
# Otherwise use the runner-installed NDK
@@ -138,6 +138,10 @@ jobs:
138138
echo "ANDROID_NDK_HOME=${PWD}/android-ndk-${ANDROID_NDK_VERSION}" >> $GITHUB_ENV
139139
fi
140140
141+
# note that we must *not* have ANDROID_NDK_ROOT set!
142+
# https://github.com/swiftlang/swift-driver/pull/1879
143+
echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
144+
141145
- name: Setup Android Environment
142146
run: |
143147
echo "$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/${{ env.ANDROID_BUILD_TOOLS_VERSION }}" >> $GITHUB_PATH

0 commit comments

Comments
 (0)