Skip to content

Commit 9bd510b

Browse files
committed
Swift Androd build
1 parent f551ad8 commit 9bd510b

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

swift-ci/sdks/android/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mkdir -p ${SDKROOT}/products
5252

5353
# Check-out the sources
5454
if [[ ! -d ${SDKROOT}/src ]]; then
55-
scripts/fetch-source.sh --source-dir ${SDKROOT}/src
55+
scripts/fetch-source.sh --source-dir ${SDKROOT}/src --swift-tag ${SWIFT_TAG}
5656
fi
5757

5858
# fetch and apply the patches

swift-ci/sdks/android/scripts/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,11 @@ cd "$sdk_name/$sdk_base"
437437

438438
cp -a ${ndk_toolchain}/sysroot ndk-sysroot
439439

440+
#quiet_pushd ndk-sysroot/usr/lib
441+
# FIXME: need to merge the multiple x86_64 archs
442+
#ln -s ../../../swift-android.sdk/x86_64/usr/lib/swift
443+
#quiet_popd
444+
440445
cat > swift-sdk.json <<EOF
441446
{
442447
"schemaVersion": "4.0",

0 commit comments

Comments
 (0)