summaryrefslogtreecommitdiff
path: root/runtime/native/dalvik_system_DexFile.cc
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2022-10-28 11:50:26 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> 2022-10-31 11:45:30 +0000
commitb459341de13eeab039c66ee4285475640d26da7e (patch)
tree6196eb6a282a6ad0c80116622d5ef200644f604d /runtime/native/dalvik_system_DexFile.cc
parent4f1c9f9df127bfc62852650f09bd06603b9db354 (diff)
Allow OatFileAssistant::Create to take std::nullopt for the context.
Partially cherry picked from commit 12f45c41158de6f6737efb102161f86f462d9290. Bug: 249984283 Test: m test-art-host-gtest-art_runtime_tests Change-Id: I7ebe2aa745d0da31242034a27f92b24dbdb08740 Merged-In: I7ebe2aa745d0da31242034a27f92b24dbdb08740
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
-rw-r--r--runtime/native/dalvik_system_DexFile.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index c04ff5ab29..a9f380dfd5 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -616,6 +616,8 @@ static jstring DexFile_getDexFileStatus(JNIEnv* env,
return nullptr;
}
+ // The API doesn't support passing a class loader context, so skip the class loader context check
+ // and assume that it's OK.
OatFileAssistant oat_file_assistant(filename.c_str(),
target_instruction_set,
/* context= */ nullptr,