diff options
| author | tynasello-google <tynasello@google.com> | 2025-06-12 08:39:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-12 11:39:28 -0400 |
| commit | 13fe07d670e8a115929c9e595c4490ef5c75f583 (patch) | |
| tree | 7e9b8b6dd37bf8016162e3e243ad45f11a12017d /libcxxabi | |
| parent | f12b1ed11672bc40a53fb1180541b2fda6e7d9fc (diff) | |
[libc++] Expand Android libc++ test config files (#142846)
Parameterize (and rename) existing libc++/libc++abi test configuration
files for the Android NDK to work for both the NDK and platform.
Android LLVM downstream seeks to test libc++ for both the NDK and
platform build (currently only testing the NDK), which will use almost
identical test configuration files. The only difference is the name of
the libc++ shared object used. Because of this we parameterize the
current test files (for both libc++ and libc++abi) with the existing
LIBCXX_SHARED_OUTPUT_NAME cmake variable, and rename the file
accordingly.
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/test/configs/llvm-libc++abi-android.cfg.in (renamed from libcxxabi/test/configs/llvm-libc++abi-android-ndk.cfg.in) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxxabi/test/configs/llvm-libc++abi-android-ndk.cfg.in b/libcxxabi/test/configs/llvm-libc++abi-android.cfg.in index f2cb62a32d4e..bc5844661536 100644 --- a/libcxxabi/test/configs/llvm-libc++abi-android-ndk.cfg.in +++ b/libcxxabi/test/configs/llvm-libc++abi-android.cfg.in @@ -1,5 +1,5 @@ # This testing configuration handles running the test suite against LLVM's -# libc++abi using adb and a libc++_shared.so library on Android. +# libc++abi using adb on Android. lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg') @@ -19,12 +19,12 @@ config.substitutions.append(('%{compile_flags}', '-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS' )) -# The NDK library is called "libc++_shared.so". Use LD_LIBRARY_PATH to find -# libc++_shared.so because older Bionic dynamic loaders don't support rpath -# lookup. The Android libc++ shared library exports libc++abi, so we don't need -# to link with -lc++abi. +# The platform library is called "libc++.so" and the NDK library is called "libc++_shared.so". +# Use LD_LIBRARY_PATH to find the libcxx shared object because older Bionic dynamic loaders +# don't support rpath lookup. The Android libc++ shared library exports libc++abi, so we +# don't need to link with -lc++abi. config.substitutions.append(('%{link_flags}', - '-nostdlib++ -L %{lib} -lc++_shared' + '-nostdlib++ -L %{lib} -l@LIBCXX_SHARED_OUTPUT_NAME@' )) config.substitutions.append(('%{exec}', '%{executor}' + |