summaryrefslogtreecommitdiff
path: root/runtime/class_linker_test.cc
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-12-03 01:20:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-12-03 01:20:06 +0000
commit0480523e01102e40a072d266e43a18a0ca4344e4 (patch)
tree3d38b5a98764fd99d6c5de1a6e9c9509168baef4 /runtime/class_linker_test.cc
parentb487af4fc80ffabe0219657a9690be1316dab8e7 (diff)
parentcc1b5357f83f0b787d51fbfde3fe870c8a2fa050 (diff)
Merge "ART: Clean up ClassLinker"
Diffstat (limited to 'runtime/class_linker_test.cc')
-rw-r--r--runtime/class_linker_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 7c06ffedb8..ddb9e590a7 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -1319,7 +1319,7 @@ TEST_F(ClassLinkerTest, RegisterDexFileName) {
ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
MutableHandle<mirror::DexCache> dex_cache(hs.NewHandle<mirror::DexCache>(nullptr));
{
- ReaderMutexLock mu(soa.Self(), *class_linker->DexLock());
+ ReaderMutexLock mu(soa.Self(), *Locks::dex_lock_);
for (const ClassLinker::DexCacheData& data : class_linker->GetDexCachesData()) {
dex_cache.Assign(soa.Self()->DecodeJObject(data.weak_root)->AsDexCache());
if (dex_cache.Get() != nullptr) {
@@ -1343,7 +1343,7 @@ TEST_F(ClassLinkerTest, RegisterDexFileName) {
0u,
nullptr));
{
- WriterMutexLock mu(soa.Self(), *class_linker->DexLock());
+ WriterMutexLock mu(soa.Self(), *Locks::dex_lock_);
// Check that inserting with a UTF16 name works.
class_linker->RegisterDexFileLocked(*dex_file, dex_cache);
}