diff options
author | 2023-01-30 14:29:11 +0000 | |
---|---|---|
committer | 2023-02-01 09:52:45 +0000 | |
commit | 0f6af5e3b51a7f5905d09a98ec8d531541666015 (patch) | |
tree | 7ed720cc521bb7f6e3b092cf6900a34d050c3aba /runtime/class_linker.h | |
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/class_linker.h')
-rw-r--r-- | runtime/class_linker.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 86e2881f05..d6d33965e2 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -48,6 +48,7 @@ namespace art { class ArtField; class ArtMethod; class ClassHierarchyAnalysis; +class ClassLoaderContext; enum class ClassRoot : uint32_t; class ClassTable; class DexFile; @@ -188,6 +189,7 @@ class ClassLinker { // properly handle read barriers and object marking. bool AddImageSpace(gc::space::ImageSpace* space, Handle<mirror::ClassLoader> class_loader, + ClassLoaderContext* context, std::vector<std::unique_ptr<const DexFile>>* out_dex_files, std::string* error_msg) REQUIRES(!Locks::dex_lock_) |