File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments