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
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index dd400f2..74f5671 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -1084,6 +1084,7 @@
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 @@
file_.reset(OatFile::OpenFromVdex(zip_fd_,
std::move(vdex),
oat_file_assistant_->dex_location_,
+ oat_file_assistant_->context_,
&error_msg));
}
}