55# gradle/src/main/groovy/net/zhuoweizhang/swiftandroid/SwiftAndroidPlugin.groovy
66#
77
8- SWIFT_INSTALL=" $( dirname$PWD ) "
9- ARCH =` uname`
8+ SWIFT_INSTALL=" $( dirname" $PWD " ) "
9+ UNAME =` uname`
1010
1111SCRIPTS=~ /.gradle/scripts
1212
@@ -41,10 +41,10 @@ if [[ ! -f "$GLIBC_MODULEMAP.orig" ]]; then
4141 cp" $GLIBC_MODULEMAP " " $GLIBC_MODULEMAP .orig"
4242fi &&
4343
44- sed -e s@/usr/local/android/ndk/platforms/android-21/arch-arm/@$SWIFT_INSTALL /ndk-android-21@< " $GLIBC_MODULEMAP .orig" > " $GLIBC_MODULEMAP " &&
44+ sed -e" s@/usr/local/android/ndk/platforms/android-21/arch-arm/@$SWIFT_INSTALL /ndk-android-21@" < " $GLIBC_MODULEMAP .orig" > " $GLIBC_MODULEMAP " &&
4545
4646rm -f" $SWIFT_INSTALL /usr/bin/swift" &&
47- if [[" $ARCH " == " Darwin" ; then
47+ if [[" $UNAME " == " Darwin" ; then
4848 SWIFT=" $( xcode-select -p) "
4949else
5050 SWIFT=" $( which swift) "
@@ -117,7 +117,7 @@ SWIFT_INSTALL="$SWIFT_INSTALL"
117117export PATH="\$ SWIFT_INSTALL/usr/bin:\$ PATH"
118118export SWIFT_EXEC=~/.gradle/scripts/swiftc-android.sh
119119
120- swift build
120+ swift build " \$ @"
121121
122122SCRIPT
123123
@@ -128,7 +128,7 @@ cat <<SCRIPT >swiftc-android.sh &&
128128#
129129
130130SWIFT_INSTALL="$SWIFT_INSTALL "
131- export PATH="\$ SWIFT_INSTALL/usr/$ARCH :\$ SWIFT_INSTALL/usr/bin:\$ PATH"
131+ export PATH="\$ SWIFT_INSTALL/usr/$UNAME :\$ SWIFT_INSTALL/usr/bin:\$ PATH"
132132
133133if [[ "\$ *" =~ " -fileno " ]]; then
134134 swift "\$ @" || (echo "*** Error executing:\$ 0\$ @" && exit 1)
137137
138138ARGS=\$ (echo "\$ *" | sed -E "s@-target [^[:space:]]+ -sdk /[^[:space:]]* (-F /[^[:space:]]* )?@@")
139139
140- if [[ "\$ * " =~ " -emit-executable " ]]; then
141- LINKER_ARGS="-Xlinker -shared -Xlinker -export-dynamic -tools-directory \$ SWIFT_INSTALL/usr/ $ARCH "
140+ if [[ "\$ ARGS " =~ " -emit-executable " && " \$ ARGS" =~ ".so " ]]; then
141+ ARGS= \$ (echo " \$ ARGS" | sed -E "s@ (-module-name [^[:space:]]+ )?-emit-executable @ -emit-library @")
142142fi
143143
144- swiftc -target armv7-none-linux-androideabi\\
145- -sdk "\$ SWIFT_INSTALL/ndk-android-21 " -L "\$ SWIFT_INSTALL/usr/$ARCH "\\
146- \$ LINKER_ARGS \$ ARGS || (echo "*** Error executing:\$ 0\$ LINKER_ARGS \$ ARGS" && exit 1)
144+ swiftc -target armv7-none-linux-androideabi-sdk " \$ SWIFT_INSTALL/ndk-android-21" \\
145+ -L "\$ SWIFT_INSTALL/usr/ $UNAME " -tools-directory "\$ SWIFT_INSTALL/usr/$UNAME "\\
146+ \$ ARGS || (echo "*** Error executing:\$ 0\$ ARGS" && exit 1)
147147
148148SCRIPT
149149