diff options
-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() { |