Android SDK build

Author: marcprux

swift-ci/sdks/android/build

@@ -3,12 +3,12 @@
 
 # the architecture(s) to build; on GH Actions we build everything
 if [[ -z "${CI}" ]]; then
-    TARGET_ARCHS=${TARGET_ARCHS:-x86_64,aarch64}
+    TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64}
     #TARGET_ARCHS=${TARGET_ARCHS:-aarch64}
 else
-    #TARGET_ARCHS=${TARGET_ARCHS:-aarch64,armv7,x86_64,x86}
+    TARGET_ARCHS=${TARGET_ARCHS:-armv7,aarch64,x86_64,x86}
     #TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64}
-    TARGET_ARCHS=${TARGET_ARCHS:-aarch64}
+    #TARGET_ARCHS=${TARGET_ARCHS:-aarch64}
 fi
 
 ANDROID_NDK_VERSION=android-ndk-r27c

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

@@ -340,9 +340,9 @@ for arch in $archs; do
             --reconfigure \
             --no-assertions \
             --android \
-            --android-ndk $ndk_home \
-            --android-arch $arch \
-            --android-api-level $android_api \
+            --android-ndk=$ndk_home \
+            --android-arch=$arch \
+            --android-api-level=$android_api \
             --native-swift-tools-path=$host_toolchain/bin \
             --native-clang-tools-path=$host_toolchain/bin \
             --cross-compile-hosts=android-$arch \
@@ -360,5 +360,7 @@ for arch in $archs; do
             --swift-testing --install-swift-testing \
             --cross-compile-append-host-target-to-destdir=False
     quiet_popd
+
+    header "Completed build for $arch in $sdk_root"
 done