diff options
| author | 2018-12-06 22:09:37 +0000 | |
|---|---|---|
| committer | 2018-12-06 22:09:37 +0000 | |
| commit | dc1309c01d7b4cbc2c9f5803f7f643fad646f9ba (patch) | |
| tree | 4e315f966919643416d8e0fd2a87c8b602ada6c6 /runtime/class_loader_utils.h | |
| parent | bee521dc73825fc75f840749fc4fc7a083a9f0cf (diff) | |
| parent | 44f67607b33e36c118fe0f62c062865b2bc8bd8f (diff) | |
Merge changes Ib1e027a1,I1608b032,I11ca161a
* changes:
ART: Rewrite Runtime fault message to be lock-free
ART: Move to using locks.h instead of mutex.h
ART: Factor out lock order and holder from mutexes
Diffstat (limited to 'runtime/class_loader_utils.h')
| -rw-r--r-- | runtime/class_loader_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/class_loader_utils.h b/runtime/class_loader_utils.h index 945d659396..69476dfb98 100644 --- a/runtime/class_loader_utils.h +++ b/runtime/class_loader_utils.h @@ -18,7 +18,7 @@ #define ART_RUNTIME_CLASS_LOADER_UTILS_H_ #include "art_field-inl.h" -#include "base/mutex.h" +#include "base/locks.h" #include "handle_scope.h" #include "jni/jni_internal.h" #include "mirror/class_loader.h" |