From 1bc977cf2f8199311a97f2ba9431a184540e3e9c Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Sat, 23 Jan 2016 14:15:49 +0000
Subject: Revert "Load app images"

Fails when a method is duplicated (see test 097-duplicate-method)

Bug: 22858531

This reverts commit f7fd970244f143b1abb956e29794c446e4d57f46.

Change-Id: Ib30ae5be00cc568e799290be6b3c8f29cbbe4c20
---
 runtime/mirror/class_loader.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'runtime/mirror/class_loader.h')

diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h
index 1957e13e36..c2a65d62e2 100644
--- a/runtime/mirror/class_loader.h
+++ b/runtime/mirror/class_loader.h
@@ -63,10 +63,7 @@ class MANAGED ClassLoader : public Object {
  private:
   // Visit instance fields of the class loader as well as its associated classes.
   // Null class loader is handled by ClassLinker::VisitClassRoots.
-  template <bool kVisitClasses,
-            VerifyObjectFlags kVerifyFlags = kDefaultVerifyFlags,
-            ReadBarrierOption kReadBarrierOption = kWithReadBarrier,
-            typename Visitor>
+  template <VerifyObjectFlags kVerifyFlags, typename Visitor>
   void VisitReferences(mirror::Class* klass, const Visitor& visitor)
       SHARED_REQUIRES(Locks::mutator_lock_)
       REQUIRES(!Locks::classlinker_classes_lock_);
-- 
cgit v1.2.3-59-g8ed1b