diff options
| author | 2023-03-10 17:59:19 +0000 | |
|---|---|---|
| committer | 2023-03-11 13:54:00 +0000 | |
| commit | 0e60ddb0c0e978063d43672ca2e6ffd83761c9eb (patch) | |
| tree | f10c0d95af764b04f7295261fa7563568fc18111 /runtime/class_linker.cc | |
| parent | cce3151716083d5b7858915c7d1d6f8514c865cc (diff) | |
Re-enable app image loader for userfaultfd.
Just disable dex cache generation for now, and make sure the image works with
the right GC.
Test: test.py
Bug: 260557058
Bug: 270936884
Change-Id: Iceae4f8a615d2f1e740936c05b121d91915b2519
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 880addb354..224b928d01 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -2098,6 +2098,10 @@ bool ClassLinker::AddImageSpace(gc::space::ImageSpace* space, *error_msg = "Checksums count does not match"; return false; } + if (oat_header->IsConcurrentCopying() != gUseReadBarrier) { + *error_msg = "GCs do not match"; + return false; + } // Check if the dex checksums match the dex files that we just loaded. uint32_t* checksums = reinterpret_cast<uint32_t*>( |