[android][build-script] Update the default arch to AArch64, as that i…

…s by far the most commonly used now
swiftlang · Jul 20, 2024 · 6ede1c2 · 6ede1c2
1 parent fb7bb19
commit 6ede1c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1393,7 +1393,7 @@ def create_argument_parser():
 
     option('--android-arch', store,
            choices=['armv7', 'aarch64', 'x86_64'],
-           default='armv7',
+           default='aarch64',
            help='The target architecture when building for Android. '
                 'Currently, only armv7, aarch64, and x86_64 are supported. '
                 '%(default)s is the default.')

diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -41,7 +41,7 @@
     'android_api_level': '21',
     'android_deploy_device_path': '/data/local/tmp',
     'android_ndk': None,
-    'android_arch': 'armv7',
+    'android_arch': 'aarch64',
     'assertions': True,
     'benchmark': False,
     'benchmark_num_o_iterations': 3,
@@ -764,7 +764,7 @@ class BuildScriptImplOption(_BaseOption):
     ChoicesOption('--swift-analyze-code-coverage',
                   choices=['false', 'not-merged', 'merged']),
     ChoicesOption('--android-arch',
-                  choices=['armv7', 'aarch64']),
+                  choices=['armv7', 'aarch64', 'x86_64']),
 
     StrOption('--android-api-level'),
     StrOption('--build-args'),