Skip to content

Commit d65b0a8

Browse files
committed
add androidfix script to fix path in Bionic module.map, copy swiftpm executables and clang headers in deploy
1 parent 695dac7 commit d65b0a8

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

release/bin/swift-androidfix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
mypath=`which $0`
3+
mydir=`dirname $mypath`
4+
if [ -z $ANDROID_NDK_HOME ]
5+
then
6+
echo "ANDROID_NDK_HOME not set: run \"export ANDROID_NDK_HOME=/path/to/ndk\""
7+
exit 1
8+
fi
9+
hardcodedpath="/home/zhuowei/ndk"
10+
sed -e "s@$hardcodedpath@$ANDROID_NDK_HOME@g" -i $mydir/../lib/swift/bionic/module.map

release/deploy.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@ do
99
echo $i
1010
strip -o bin/$i ../bin/$i
1111
done
12-
for i in swift-autolink-extract swiftc swiftc-android swift-android-push armv7-none-linux-androideabi-ld
12+
for i in swift-autolink-extract swiftc swiftc-android swift-android-push armv7-none-linux-androideabi-ld swift-androidfix swiftc-pm-android
1313
do
1414
cp -P ../bin/$i bin/$i
1515
done
1616
mkdir lib
1717
cp -r ../lib/swift lib/
1818
[ -a lib/swift/android/libicuuc.so ] || echo "WHERE IS ICU"
19+
cp -r ../../swiftpm-linux-x86_64/lib/swift lib/
20+
cp -r ../../swiftpm-linux-x86_64/debug/swift-build bin/
21+
cp -r ../../llbuild-linux-x86_64/bin/* bin/
22+
rm lib/swift/clang
23+
cp -r ../../llvm-linux-x86_64/lib/clang/3.8.0 lib/swift/clang
1924
cd ..
2025
rm swift_android.tar.xz
2126
tar cJf swift_android.tar.xz swiftandroid

0 commit comments

Comments
 (0)