diff options
| author | 2019-04-01 19:38:10 +0000 | |
|---|---|---|
| committer | 2019-04-01 19:38:48 +0000 | |
| commit | b4bb63aa4be80722643611fc931976b3544f14b5 (patch) | |
| tree | 7982bd7e79474b24f8f258efec3ac64328b34d7e /runtime/native/dalvik_system_DexFile.cc | |
| parent | 71d614f12ad6da2f15e835e22fe577b2d1d86bb0 (diff) | |
Revert "Verify InMemoryDexClassLoader classes in a background thread"
This reverts commit d592dbe1e2b09079382713220b2ff59f02db1859.
Reason for revert: art buildbots crashing
Change-Id: Ida6bb79cb498e708df5c535edc16e4fe9875442c
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
| -rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index d1ea6559ad..feaf619afa 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -340,26 +340,6 @@ static jobject DexFile_openDexFileNative(JNIEnv* env, } } -static void DexFile_verifyInBackgroundNative(JNIEnv* env, - jclass, - jobject cookie, - jobject class_loader) { - CHECK(cookie != nullptr); - CHECK(class_loader != nullptr); - - // Extract list of dex files from the cookie. - std::vector<const DexFile*> dex_files; - const OatFile* oat_file; - if (!ConvertJavaArrayToDexFiles(env, cookie, dex_files, oat_file)) { - Thread::Current()->AssertPendingException(); - return; - } - CHECK(oat_file == nullptr) << "Called verifyInBackground on a dex file backed by oat"; - - // Hand over to OatFileManager to spawn a verification thread. - Runtime::Current()->GetOatFileManager().RunBackgroundVerification(dex_files, class_loader); -} - static jboolean DexFile_closeDexFile(JNIEnv* env, jclass, jobject cookie) { std::vector<const DexFile*> dex_files; const OatFile* oat_file; @@ -913,7 +893,6 @@ static JNINativeMethod gMethods[] = { "[I" "[I" ")Ljava/lang/Object;"), - NATIVE_METHOD(DexFile, verifyInBackgroundNative, "(Ljava/lang/Object;Ljava/lang/ClassLoader;)V"), NATIVE_METHOD(DexFile, isValidCompilerFilter, "(Ljava/lang/String;)Z"), NATIVE_METHOD(DexFile, isProfileGuidedCompilerFilter, "(Ljava/lang/String;)Z"), NATIVE_METHOD(DexFile, |