File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -128,8 +128,8 @@ swift --version
128128log " Installing Swift SDK"
129129swift sdk install " $sdk_path "
130130
131+ log " Swift SDK Post-install"
131132if [[ " $sdk " == " android-sdk" ]]; then
132- log " Swift SDK Post-install"
133133 # guess some common places where the swift-sdks file lives
134134 cd ~ /Library/org.swift.swiftpm || cd ~ /.config/swiftpm || cd ~ /.local/swiftpm || cd ~ /.swiftpm || cd /root/.swiftpm || exit 1
135135
@@ -139,7 +139,7 @@ if [[ "$sdk" == "android-sdk" ]]; then
139139 unzip -q ndk.zip
140140 rm ndk.zip
141141 export ANDROID_NDK_HOME=" ${PWD} /android-ndk-${android_ndk_version} "
142- bundledir=$( ls -d swift-sdks/ * android* .artifactbundle | head -n 1)
143- ${bundledir} /swift-android/scripts/setup-android-sdk.sh
142+ bundledir=$( find . -type d -maxdepth 2 -name ' *android*.artifactbundle' | head -n 1)
143+ " ${bundledir} " /swift-android/scripts/setup-android-sdk.sh
144144 cd - || exit
145145fi
You can’t perform that action at this time.
0 commit comments