commit 6d335635fc8b575261be4a7efea0ea5f4adb9fac
author Brian Carlstrom <bdc@google.com> Sat Jun 04 00:22:32 2016 +0000
committer Mathieu Chartier <mathieuc@google.com> Mon Jun 06 13:08:51 2016 -0700
tree 9b3d2c06470319fbb91d683efac163dfd263888d
parent 55554a9c0a5ea80b0a6e361be75944d560e75197

Revert "Hold dex caches live in class table"

This reverts commit d6d49e56c2b7b11f474acb80cb02bb1fe9b7861e.

Bug: 29083330

(cherry picked from commit f102faf1bcbdb2149e3e7bf27b1819f621b7894b)

Change-Id: Id0c921bd6fe422159f8daa598dc8e7c9ed6eca47

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 17b87cd..f6ce545 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -377,8 +377,7 @@
       SHARED_REQUIRES(Locks::mutator_lock_)
       REQUIRES(!dex_lock_, !Roles::uninterruptible_);
 
-  mirror::DexCache* RegisterDexFile(const DexFile& dex_file,
-                                    mirror::ClassLoader* class_loader)
+  mirror::DexCache* RegisterDexFile(const DexFile& dex_file, LinearAlloc* linear_alloc)
       REQUIRES(!dex_lock_)
       SHARED_REQUIRES(Locks::mutator_lock_);
   void RegisterDexFile(const DexFile& dex_file, Handle<mirror::DexCache> dex_cache)