Forward android-arch form build-script to build-script-impl in case of i686, x86_64

Author: zayass

CMakeLists.txt

@@ -736,7 +736,7 @@ if(swift_build_android AND NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
   endif()
 
   if("${SWIFT_SDK_ANDROID_ARCHITECTURES}" STREQUAL "")
-    set(SWIFT_SDK_ANDROID_ARCHITECTURES armv7;aarch64)
+    set(SWIFT_SDK_ANDROID_ARCHITECTURES armv7;aarch64;x86_64)
   endif()
   configure_sdk_unix("Android" "${SWIFT_SDK_ANDROID_ARCHITECTURES}")
 endif()

utils/build-presets.ini

@@ -808,6 +808,13 @@ android-icu-i18n=%(icu_dir)s/libicui18nswift.so
 android-icu-i18n-include=%(icu_dir)s/icu/source/i18n
 android-icu-data=%(icu_dir)s/libicudataswift.so
 
+[preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,armv7]
+mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build
+
+dash-dash
+
+android-arch=armv7
+
 [preset: buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build,aarch64]
 mixin-preset=buildbot_linux_crosscompile_android,tools=RA,stdlib=RD,build
 

utils/build-script

@@ -300,6 +300,12 @@ class BuildScriptInvocation(object):
             elif args.android_arch == "aarch64":
                 args.stdlib_deployment_targets.append(
                     StdlibDeploymentTarget.Android.aarch64.name)
+            elif args.android_arch == "i686":
+                args.stdlib_deployment_targets.append(
+                    StdlibDeploymentTarget.Android.i686.name)
+            elif args.android_arch == "x86_64":
+                args.stdlib_deployment_targets.append(
+                    StdlibDeploymentTarget.Android.x86_64.name)
 
         # Infer platform flags from manually-specified configure targets.
         # This doesn't apply to Darwin platforms, as they are

utils/build_swift/driver_arguments.py

@@ -922,7 +922,7 @@ def create_argument_parser():
                     android.adb.commands.DEVICE_TEMP_DIR))
 
     option('--android-arch', store,
-           choices=['armv7', 'aarch64'],
+           choices=['armv7', 'aarch64', "i686", "x86_64"],
            default='armv7',
            help='The Android target architecture when building for Android. '
                 'Currently only armv7 and aarch64 are supported. '

utils/swift_build_support/swift_build_support/targets.py

@@ -125,7 +125,7 @@ class StdlibDeploymentTarget(object):
 
     Cygwin = Platform("cygwin", archs=["x86_64"])
 
-    Android = Platform("android", archs=["armv7", "aarch64"])
+    Android = Platform("android", archs=["armv7", "aarch64", "i686", "x86_64"])
 
     Windows = Platform("windows", archs=["x86_64"])