From cc2d6e59615eabfdb474a23d063e6ddc9b081da4 Mon Sep 17 00:00:00 2001 From: Butta Date: Sat, 27 Nov 2021 17:48:44 +0530 Subject: [PATCH] [android] Do not pick a linker when testing anymore, as the NDK only uses lld now --- test/lit.cfg | 2 -- test/lit.site.cfg.in | 1 - validation-test/lit.site.cfg.in | 1 - 3 files changed, 4 deletions(-) diff --git a/test/lit.cfg b/test/lit.cfg index 1087e57f26a06..3549959af5c30 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -1527,7 +1527,6 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android': '-sdk', config.variant_sdk, '-Xclang-linker', '--target={}{}'.format(config.variant_triple, config.android_api_level), '-tools-directory', tools_directory, - '-use-ld=%s' % config.android_linker_name, config.resource_dir_opt, mcp_opt, config.swift_test_options, config.swift_driver_test_options, swift_execution_tests_extra_flags]) config.target_codesign = "echo" @@ -1575,7 +1574,6 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android': '--target={}{}'.format(config.variant_triple, config.android_api_level), '-tools-directory', tools_directory, config.resource_dir_opt, mcp_opt, - '-use-ld=%s' % config.android_linker_name, config.swift_driver_test_options]) config.target_swift_modulewrap = ' '.join([ config.swiftc, '-modulewrap', diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index ed38aecbb4122..db6837e458c1c 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -42,7 +42,6 @@ config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@" config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@" # --- android --- -config.android_linker_name = "lld" config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@" config.android_api_level = "@SWIFT_ANDROID_API_LEVEL@" diff --git a/validation-test/lit.site.cfg.in b/validation-test/lit.site.cfg.in index ed5fd908342aa..b13ad22a10b41 100644 --- a/validation-test/lit.site.cfg.in +++ b/validation-test/lit.site.cfg.in @@ -36,7 +36,6 @@ config.swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@" config.darwin_xcrun_toolchain = "@SWIFT_DARWIN_XCRUN_TOOLCHAIN@" # --- Android Configuration --- -config.android_linker_name = "lld" config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@" config.android_api_level = "@SWIFT_ANDROID_API_LEVEL@"