diff options
| author | Martin Stjernholm <mast@google.com> | 2024-04-15 16:23:21 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2024-04-18 12:12:04 +0000 |
| commit | afc444479386645f5f876f10bb1cb0971dd15ad5 (patch) | |
| tree | 360a4aa0ba75cd972bd1228672b56d979de3cb9f | |
| parent | bda11bd68212f6a03381a849b0ee44bebf3ca5ba (diff) | |
| download | art-afc444479386645f5f876f10bb1cb0971dd15ad5.tar.gz | |
Remove libunwindstack dependency from runtime tests.
This reverts commit 6879161169acca5a9851f53e2de77ab98c22713b and
removes libunwindstack completely from art_runtime_tests_defaults. It's
not needed by tests and cause ODR problems with libartd-gtest when it's
linked statically, as ASAN tests report.
Test: env SANITIZE_HOST=address ASAN_OPTIONS=detect_leaks=0 \
m test-art-host-gtest-art_runtime_tests64
Test: atest art_standalone_runtime_tests
Bug: 247108425
Flag: TEST_ONLY
Change-Id: I042e1c0188b8c9819fbf37fcf7b3ce19a9a7fcca
| -rw-r--r-- | runtime/Android.bp | 4 | ||||
| -rw-r--r-- | test/standalone_test_lib_check.cc | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/runtime/Android.bp b/runtime/Android.bp index 8fd9c4aa70..a1d06c48d7 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -1110,10 +1110,6 @@ art_cc_defaults { "verifier/method_verifier_test.cc", "verifier/reg_type_test.cc", ], - shared_libs: [ - // TODO(b/247108425): Resolve ODR problems and link statically. - "libunwindstack", - ], static_libs: [ "libgmock", ], diff --git a/test/standalone_test_lib_check.cc b/test/standalone_test_lib_check.cc index 0d90055142..a52bea7935 100644 --- a/test/standalone_test_lib_check.cc +++ b/test/standalone_test_lib_check.cc @@ -82,8 +82,6 @@ constexpr const char* kAllowedDynamicLibDeps[] = { "libnativeloader.so", // TODO(b/333438055): Remove this when we can link libc++.so statically everywhere. "libc++.so", - // TODO(b/247108425): Fix the ODR problem and go back to static linking for libunwindstack. - "libunwindstack.so", }; Result<std::string> GetCurrentElfObjectPath() { |