diff options
author | 2023-01-30 14:29:11 +0000 | |
---|---|---|
committer | 2023-02-01 09:52:45 +0000 | |
commit | 0f6af5e3b51a7f5905d09a98ec8d531541666015 (patch) | |
tree | 7ed720cc521bb7f6e3b092cf6900a34d050c3aba /runtime/oat_file_assistant.cc | |
parent | d04ed700190056ecd367ee41e6b7f3b87dc7f901 (diff) |
Reland "Write classes in runtime-generated app image."
This reverts commit 24b3d648ff6c2c200003f55ac63fc910d7bfd40f.
Bug: 260557058
Reason for revert:
- Encode class loader context in image, and check it at load time.
- Set nterp entrypoint to methods that can.
Test: test.py
Test: atest com.android.bluetooth.opp.BluetoothOppObexServerSessionTest#onPut_withUnsupportedMimeTypeInHeader_returnsHttpBadRequest
Change-Id: Ibf4a8604c4a226d1acc021103668e211446bb53c
Diffstat (limited to 'runtime/oat_file_assistant.cc')
-rw-r--r-- | runtime/oat_file_assistant.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index dd400f2876..74f56710f0 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -1084,6 +1084,7 @@ const OatFile* OatFileAssistant::OatFileInfo::GetFile() { file_.reset(OatFile::OpenFromVdex(zip_fd_, std::move(vdex), oat_file_assistant_->dex_location_, + oat_file_assistant_->context_, &error_msg)); } } else if (android::base::EndsWith(filename_, kDmExtension)) { @@ -1096,6 +1097,7 @@ const OatFile* OatFileAssistant::OatFileInfo::GetFile() { file_.reset(OatFile::OpenFromVdex(zip_fd_, std::move(vdex), oat_file_assistant_->dex_location_, + oat_file_assistant_->context_, &error_msg)); } } |