Revert "Revert "Revert "Revert some flaky unloading"""

Ensure that all threads are in the JNI code before destroying the
runtime.

Bug: 28406866

This reverts commit b2716bbf321293ddbd0b96f0ea999794b0e9b09b.

Change-Id: I7f6189a9d0d8a1bf7af5535026804bc2183466c9

1 files changed, 0 insertions, 20 deletions

diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index f58af5a8da..5bdb36cafc 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -418,26 +418,6 @@ void CommonRuntimeTestImpl::TearDown() {
   (*icu_cleanup_fn)();
 
   Runtime::Current()->GetHeap()->VerifyHeap();  // Check for heap corruption after the test
-
-  // Manually closing the JNI libraries.
-  // Runtime does not support repeatedly doing JNI->CreateVM, thus we need to manually clean up the
-  // dynamic linking loader so that gtests would not fail.
-  // Bug: 25785594
-  if (runtime_->IsStarted()) {
-    {
-      // We retrieve the handle by calling dlopen on the library. To close it, we need to call
-      // dlclose twice, the first time to undo our dlopen and the second time to actually unload it.
-      // See man dlopen.
-      void* handle = dlopen("libjavacore.so", RTLD_LAZY);
-      dlclose(handle);
-      CHECK_EQ(0, dlclose(handle));
-    }
-    {
-      void* handle = dlopen("libopenjdkd.so", RTLD_LAZY);
-      dlclose(handle);
-      CHECK_EQ(0, dlclose(handle));
-    }
-  }
 }
 
 static std::string GetDexFileName(const std::string& jar_prefix, bool host) {