Skip to content

Commit da23205

Browse files
authored
Merge pull request #32504 from drodriguez/android-eabi-as-abi-stable
[android] Set linux-androideabi (Android ARM 32 bits) as ABI stable during testing.
2 parents 15dfa83 + 3820568 commit da23205

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/lit.cfg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ if (run_os == 'maccatalyst'):
693693
target_os_abi = 'macosx'
694694
target_os_is_maccatalyst = "TRUE"
695695
config.available_features.add("OS=ios")
696-
if (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu', 'windows-msvc', 'linux-android']):
696+
if (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'windows-cygnus', 'windows-gnu', 'windows-msvc', 'linux-android', 'linux-androideabi']):
697697
target_mandates_stable_abi = "TRUE"
698698
config.available_features.add('swift_only_stable_abi')
699699
config.substitutions.append(('%target-os-abi', target_os_abi))
@@ -1354,7 +1354,7 @@ elif run_os == 'wasi':
13541354
'-target', config.variant_triple,
13551355
'-Xcc', '--sysroot=%s' % config.variant_sdk,
13561356
'-Xclang-linker', '--sysroot=%s' % config.variant_sdk,
1357-
'-toolchain-stdlib-rpath', resource_dir_opt,
1357+
'-toolchain-stdlib-rpath', resource_dir_opt,
13581358
mcp_opt, config.swift_test_options,
13591359
config.swift_driver_test_options, swift_execution_tests_extra_flags])
13601360
config.target_codesign = "echo"
@@ -1400,7 +1400,7 @@ elif run_os == 'wasi':
14001400
"%s -target %s %s -fobjc-runtime=ios-5.0" %
14011401
(config.clang, config.variant_triple, clang_mcp_opt))
14021402
config.target_ld = (
1403-
"%s -L%r" %
1403+
"%s -L%r" %
14041404
(config.wasm_ld, make_path(test_resource_dir, config.target_sdk_name)))
14051405

14061406
# The Swift interpreter is not available when targeting WebAssembly/WASI.
@@ -1686,7 +1686,7 @@ if not kIsWindows:
16861686
"LD_LIBRARY_PATH='{0}:{1}' " # Linux option
16871687
"SIMCTL_CHILD_DYLD_LIBRARY_PATH='{0}' " # Simulator option
16881688
.format(all_stdlib_path, libdispatch_path)) + config.target_run
1689-
1689+
16901690
if not getattr(config, 'target_run_simple_swift', None):
16911691
config.target_run_simple_swift_parameterized = SubstituteCaptures(
16921692
"%%empty-directory(%%t) && "

0 commit comments

Comments
 (0)