Android SDK build

Author: marcprux

swift-ci/sdks/android/build

@@ -2,7 +2,7 @@
 # Swift Android SDK: Top-level Build Script
 
 # default architectures to build for
-TARGET_ARCHS=${TARGET_ARCHS:-armv7,aarch64,x86_64}
+TARGET_ARCHS=${TARGET_ARCHS:-aarch64,x86_64,armv7}
 
 ANDROID_NDK_VERSION=android-ndk-r27c
 ANDROID_API=28
@@ -91,3 +91,6 @@ popd
 
 ./scripts/build.sh --products-dir ${SDKROOT}/products --source-dir ${SDKROOT}/src --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --android-api ${ANDROID_API} --host-toolchain ${HOST_TOOLCHAIN} --archs $TARGET_ARCHS
 
+# assemble the artifactbundle
+#./scripts/assemble.sh --products-dir ${SDKROOT}/products --build-dir ${SDKROOT}/build --ndk-home ${ANDROID_NDK_HOME} --archs $TARGET_ARCHS
+

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -67,10 +67,12 @@ if [[ -z "${SWIFT_VERSION}" ]]; then
     SWIFT_VERSION=scheme:release/6.1
 fi
 if [[ -z "${LIBXML2_VERSION}" ]]; then
-    LIBXML2_VERSION=2.14.2
+    LIBXML2_VERSION=2.12.7
+    #LIBXML2_VERSION=2.14.2
 fi
 if [[ -z "${CURL_VERSION}" ]]; then
-    CURL_VERSION=8.13.0
+    CURL_VERSION=8.7.1
+    #CURL_VERSION=8.13.0
 fi
 if [[ -z "${BORINGSSL_VERSION}" ]]; then
     BORINGSSL_VERSION=fips-20220613