Android SDK build

Author: marcprux

swift-ci/sdks/android/build

@@ -22,38 +22,35 @@ if [[ ! -d $SWIFT_ROOT ]]; then
     mkdir -p $SWIFT_ROOT
     pushd $SWIFT_ROOT
 
-
     SWIFT_URL="https://download.swift.org/$SWIFT_BRANCH/$(echo $HOST_ARCH | tr -d '.')/$SWIFT_TAG/$SWIFT_BASE.tar.gz"
     wget -q $SWIFT_URL
     tar xzf $SWIFT_BASE.tar.gz
 
     popd
 fi
 
-$SWIFT_ROOT/$SWIFT_BASE/usr/bin/swift --version
+#HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-$(dirname $(dirname $(which swiftc)))}
+HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
+$HOST_TOOLCHAIN/bin/swift --version
+
 # ensure the correct Swift is first in the PATH
-export PATH=$SWIFT_ROOT/$SWIFT_BASE/usr/bin:$PATH
+export PATH=$HOST_TOOLCHAIN/bin:$PATH
 
 # fetch the patches
 PATCHDIR=${SDKROOT}/patches
 if [[ ! -d ${PATCHDIR} ]]; then
     git clone https://github.com/finagolfin/swift-android-sdk.git ${PATCHDIR}
 fi
 
-HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-$(dirname $(dirname $(which swiftc)))}
-#HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-${HOME}/.local/share/swiftly/toolchains/6.1.0/usr}
-
-${HOST_TOOLCHAIN}/bin/swift --version
-
 export ANDROID_NDK_HOME=${SDKROOT}/ndk/${NDK}
 export ANDROID_NDK=${ANDROID_NDK_HOME}
 
 if [[ ! -d ${ANDROID_NDK_HOME} ]]; then
     mkdir -p $(dirname ${ANDROID_NDK_HOME})
     pushd $(dirname ${ANDROID_NDK_HOME})
     NDKFILE=$(basename $ANDROID_NDK_HOME)-linux.zip
-    wget https://dl.google.com/android/repository/${NDKFILE}
-    unzip ${NDKFILE}
+    wget -q https://dl.google.com/android/repository/${NDKFILE}
+    unzip -q ${NDKFILE}
     popd
 fi
 
@@ -64,9 +61,5 @@ if [[ ! -d ${SDKROOT}/src ]]; then
     scripts/fetch-source.sh --source-dir ${SDKROOT}/src
 fi
 
-if [[ ! -d ${SDKROOT}/src ]]; then
-    ./scripts/fetch-source.sh --source-dir ${SDKROOT}/src
-fi
-
 ./scripts/build.sh --patch-dir ${PATCHDIR} --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${API} --host-toolchain ${HOST_TOOLCHAIN} --archs $ARCH
 

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

@@ -353,6 +353,8 @@ for arch in $archs; do
         # need to un-apply libandroid-spawn since we don't need it for API ???+
         perl -pi -e 's/MATCHES "Android"/MATCHES "AndroidDISABLED"/g' llbuild/lib/llvm/Support/CMakeLists.txt
         perl -pi -e 's/ STREQUAL Android\)/ STREQUAL AndroidDISABLED\)/g' swift-corelibs-foundation/Sources/Foundation/CMakeLists.txt
+        # fix for Process.swift:953:57: error: value of optional type 'posix_spawnattr_t?' (aka 'Optional<OpaquePointer>') must be unwrapped to a value of type 'posix_spawnattr_t' (aka 'OpaquePointer')
+        perl -pi -e 's%canImport\(Darwin\) \|\| os\(Android\) \|\| os\(OpenBSD\)%canImport\(Darwin\) || os\(AndroidXXX\) || os\(OpenBSD\)%g' swift-corelibs-foundation/Sources/Foundation/Process.swift
 
         git apply $patch_dir/swift-android-ci-release.patch || true
         git apply $patch_dir/swift-android-testing-release.patch || true

swift-ci/sdks/static-linux/build

@@ -35,7 +35,7 @@ esac
 $DOCKER build --build-arg OS_ARCH_SUFFIX=$OS_ARCH_SUFFIX -t static-swift-linux .
 
 # Check-out the sources
-scripts/fetch-source.sh --source-dir source
+scripts/fetch-source.sh --clone-with-ssh --source-dir source
 
 mkdir -p products