Skip to content

Commit bbc4a12

Browse files
committed
Fix location of libc++_shared.so
1 parent 6433df2 commit bbc4a12

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/scripts/android/android-emulator-tests.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ EMULATOR_NAME="swiftemu"
2626
ANDROID_PROFILE="Nexus 10"
2727
ANDROID_EMULATOR_LAUNCH_TIMEOUT=300
2828

29+
export SWIFTPM_HOME=/root/.swiftpm
30+
export SWIFT_ANDROID_SDK_HOME="${SWIFTPM_HOME}"/swift-sdks/swift-DEVELOPMENT-SNAPSHOT-2025-12-11-a_android.artifactbundle/
31+
export ANDROID_NDK_HOME="${SWIFTPM_HOME}"/android-ndk-r27d
32+
2933
install_package() {
3034
# Detect package manager
3135
if command -v apt >/dev/null 2>&1; then
@@ -157,8 +161,7 @@ TEST_PACKAGE=$(ls -1 debug/*.xctest | tail -n 1 | xargs basename)
157161
cp -a debug/"${TEST_PACKAGE}" "${STAGING}"
158162
find debug/ -name '*.resources' -exec cp -a {} "${STAGING}" \;
159163
cp -a "${SWIFT_ANDROID_SDK_HOME}"/swift-android/swift-resources/usr/lib/swift-"${ANDROID_EMULATOR_ARCH_TRIPLE}"/android/*.so "${STAGING}"
160-
#cp -a "${ANDROID_NDK_HOME}"/toolchains/llvm/prebuilt/*/sysroot/usr/lib/"${ANDROID_EMULATOR_ARCH_TRIPLE}"-linux-android/libc++_shared.so "${STAGING}"
161-
cp -a /root/.swiftpm/android-ndk-r27d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/"${ANDROID_EMULATOR_ARCH_TRIPLE}"-linux-android/libc++_shared.so "${STAGING}"
164+
cp -a "${ANDROID_NDK_HOME}"/toolchains/llvm/prebuilt/*/sysroot/usr/lib/"${ANDROID_EMULATOR_ARCH_TRIPLE}"-linux-android/libc++_shared.so "${STAGING}"
162165

163166
log "Copy Swift test package to emulator"
164167

0 commit comments

Comments
 (0)