diff options
| author | 2022-10-31 13:23:35 +0000 | |
|---|---|---|
| committer | 2022-10-31 13:23:35 +0000 | |
| commit | 7645d01f67d102053f1041977f958ef8fa1eea54 (patch) | |
| tree | b81c9374c2578c0f67d2b2d481f9b84ed67fb365 /runtime/native/dalvik_system_DexFile.cc | |
| parent | 8a13204ee7b0b1f0c6721095b7e407d1a2d2f9c0 (diff) | |
| parent | b459341de13eeab039c66ee4285475640d26da7e (diff) | |
Allow OatFileAssistant::Create to take std::nullopt for the context. am: b459341de1
Original change: https://android-review.googlesource.com/c/platform/art/+/2276727
Change-Id: I51aa4a18979cc880da2518a7d431e66d4ca7abaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'runtime/native/dalvik_system_DexFile.cc')
| -rw-r--r-- | runtime/native/dalvik_system_DexFile.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index 7664fe5977..a4ccdf8a5c 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -617,6 +617,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, |