Skip to content

Commit 1cfb8f0

Browse files
authored
[android] Do not pick a linker when testing anymore, as the NDK only uses lld now (#40303)
1 parent c89eca6 commit 1cfb8f0

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed

test/lit.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,6 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
15271527
'-sdk', config.variant_sdk, '-Xclang-linker',
15281528
'--target={}{}'.format(config.variant_triple, config.android_api_level),
15291529
'-tools-directory', tools_directory,
1530-
'-use-ld=%s' % config.android_linker_name,
15311530
config.resource_dir_opt, mcp_opt, config.swift_test_options,
15321531
config.swift_driver_test_options, swift_execution_tests_extra_flags])
15331532
config.target_codesign = "echo"
@@ -1575,7 +1574,6 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
15751574
'--target={}{}'.format(config.variant_triple, config.android_api_level),
15761575
'-tools-directory', tools_directory,
15771576
config.resource_dir_opt, mcp_opt,
1578-
'-use-ld=%s' % config.android_linker_name,
15791577
config.swift_driver_test_options])
15801578
config.target_swift_modulewrap = ' '.join([
15811579
config.swiftc, '-modulewrap',

test/lit.site.cfg.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@"
4242
config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
4343

4444
# --- android ---
45-
config.android_linker_name = "lld"
4645
config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
4746
config.android_api_level = "@SWIFT_ANDROID_API_LEVEL@"
4847

validation-test/lit.site.cfg.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@"
3636
config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@"
3737

3838
# --- Android Configuration ---
39-
config.android_linker_name = "lld"
4039
config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
4140
config.android_api_level = "@SWIFT_ANDROID_API_LEVEL@"
4241

0 commit comments

Comments
 (0)