Update build script

Author: colemancda

Demo/build-swift.sh

@@ -1,11 +1,32 @@
 #!/bin/bash
-set -e
-source swift-define
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/swift-define"
+JNI_LIBS_DIR="$SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH"
 
 # Build with SwiftPM
-ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION=$ANDROID_SDK_VERSION skip android build --arch $SWIFT_TARGET_ARCH --android-api-level $ANDROID_SDK_VERSION
+ANDROID_NDK_ROOT="" ANDROID_SDK_VERSION="$ANDROID_SDK_VERSION" skip android build --arch "$SWIFT_TARGET_ARCH" --android-api-level "$ANDROID_SDK_VERSION"
 
 # Copy compiled Swift package
-mkdir -p $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
-cp -rf $SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftAndroidApp.so \
-    $SRC_ROOT/app/src/main/jniLibs/$ANDROID_ARCH/
+mkdir -p "$JNI_LIBS_DIR/"
+cp -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftAndroidApp.so" "$JNI_LIBS_DIR/"
+
+# Copy Swift runtime shared libraries required by libSwiftAndroidApp.so.
+if [[ -d "$SWIFT_ANDROID_RUNTIME_LIBS" ]]; then
+    shopt -s nullglob
+    for so in "$SWIFT_ANDROID_RUNTIME_LIBS"/*.so; do
+        cp -f "$so" "$JNI_LIBS_DIR/"
+    done
+    shopt -u nullglob
+fi
+
+# Copy SwiftJava helper library when available.
+if [[ -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftJava.so" ]]; then
+    cp -f "$SWIFT_PACKAGE_SRC/.build/$SWIFT_TARGET_NAME/debug/libSwiftJava.so" "$JNI_LIBS_DIR/"
+fi
+
+# Copy C++ runtime from Android sysroot.
+if [[ -f "$SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so" ]]; then
+    cp -f "$SWIFT_ANDROID_SYSROOT/usr/lib/$ANDROID_LIB/libc++_shared.so" "$JNI_LIBS_DIR/"
+fi

Demo/setup.sh

@@ -19,9 +19,9 @@ rm -rf "$JNI_LIBS_DIR/"
 mkdir -p "$JNI_LIBS_DIR/"
 
 copied_swift_libs=0
-if [[ -d "$SWIFT_ANDROID_LIBS" ]]; then
+if [[ -d "$SWIFT_ANDROID_RUNTIME_LIBS" ]]; then
     shopt -s nullglob
-    for so in "$SWIFT_ANDROID_LIBS"/*.so; do
+    for so in "$SWIFT_ANDROID_RUNTIME_LIBS"/*.so; do
         cp -f "$so" "$JNI_LIBS_DIR/"
         copied_swift_libs=1
     done

Demo/swift-define

@@ -22,6 +22,7 @@ fi
 SWIFT_SDK=swift-$SWIFT_VERSION_SHORT-release-android-$ANDROID_SDK_VERSION-sdk
 SWIFT_ANDROID_SYSROOT="$SWIFT_SDKS_ROOT/$SWIFT_ARTIFACT_BUNDLE/swift-android/ndk-sysroot"
 SWIFT_ANDROID_LIBS="$SWIFT_SDKS_ROOT/$SWIFT_ARTIFACT_BUNDLE/swift-android/swift-resources/usr/lib/swift-$SWIFT_TARGET_ARCH"
+SWIFT_ANDROID_RUNTIME_LIBS="$SWIFT_ANDROID_LIBS/android"
 SWIFT_PACKAGE_SRC=$SRC_ROOT
 JAVA_HOME=$SWIFT_ANDROID_SYSROOT/usr