diff options
| author | 2016-11-24 13:03:57 +0000 | |
|---|---|---|
| committer | 2016-11-24 13:03:57 +0000 | |
| commit | 09ded9201fbeec605b12741ae255663c14bda225 (patch) | |
| tree | c0276a06f8b6dba35e843098a05be326c8f5e2ac /runtime/class_linker.h | |
| parent | 25dcbad4462ea7279ee2bbe0884abc25bdfac77a (diff) | |
Revert "Revert "Revert "Make sure that const-class linkage is preserved."""
626-const-class-linking is failing (spurious wakeups?)
970-iface-super-resolution-gen is failing:
dex2oatd F 11-24 10:57:16 6410 6410 image_writer.cc:1144]
Check failed: !IsBootClassLoaderClass(as_klass)
java.lang.Class<java.lang.NoSuchMethodError>
Bug: 30627598
This reverts commit 25dcbad4462ea7279ee2bbe0884abc25bdfac77a.
Change-Id: Ie010169bdde45e6ccf2e04a521da4682bd817114
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 88028ead20..95634484fc 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -218,6 +218,12 @@ class ClassLinker { mirror::Class* FindPrimitiveClass(char type) REQUIRES_SHARED(Locks::mutator_lock_); + // General class unloading is not supported, this is used to prune + // unwanted classes during image writing. + bool RemoveClass(const char* descriptor, ObjPtr<mirror::ClassLoader> class_loader) + REQUIRES(!Locks::classlinker_classes_lock_) + REQUIRES_SHARED(Locks::mutator_lock_); + void DumpAllClasses(int flags) REQUIRES(!Locks::classlinker_classes_lock_) REQUIRES_SHARED(Locks::mutator_lock_); |