Skip to content

Change default Android SDK build command #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakepetroules wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −3
Open

Change default Android SDK build command #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/android/android-emulator-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ STAGING_DIR="swift-android-test"
rm -rf "${STAGING_DIR}"
mkdir "${STAGING_DIR}"

BUILD_DIR=.build/"${ANDROID_SDK_TRIPLE}"/debug
BUILD_DIR=$(swift build --show-bin-path --swift-sdk "${ANDROID_SDK_TRIPLE}")

find "${BUILD_DIR}" -name '*.xctest' -exec cp -av {} "${STAGING_DIR}" \;
find "${BUILD_DIR}" -name '*.resources' -exec cp -av {} "${STAGING_DIR}" \;
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/scripts/install-and-build-with-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,20 @@ if [[ "$INSTALL_WASM" == true ]]; then
fi
fi

# Make the custom toolchain available to subsequent workflow steps
for _exec_var in "$SWIFT_EXECUTABLE_FOR_ANDROID_SDK" "$SWIFT_EXECUTABLE_FOR_STATIC_LINUX_SDK" "$SWIFT_EXECUTABLE_FOR_WASM_SDK"; do
if [[ -n "$_exec_var" && "$_exec_var" != "swift" ]]; then
_bin_dir="$(dirname "$_exec_var")"
log "Adding custom toolchain to PATH: $_bin_dir"
export PATH="$_bin_dir:$PATH"
if [[ -n "${GITHUB_PATH:-}" ]]; then
echo "$_bin_dir" >> "$GITHUB_PATH"
fi
break
fi
done
unset _exec_var _bin_dir

ANDROID_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/android-sdk"
STATIC_LINUX_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/static-sdk"
WASM_SDK_DOWNLOAD_ROOT="${SWIFT_DOWNLOAD_ROOT}/${SWIFT_VERSION_BRANCH}/wasm-sdk"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/swift_package_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ on:
android_sdk_build_command:
type: string
description: "Command to use when building the package with the Swift SDK for Android"
# Temporarily use native build system on Android due to https://github.com/swiftlang/swift/issues/88282
default: "swift build --build-system native"
default: "swift build"
android_sdk_triples:
type: string
description: "The triples to use when building with the Swift SDK for Android. The final triple in the list will be used for the emulator testing and should match the host architecture."
Expand Down
Loading