commit 8a48741b96ca9cc5835cac72ac133c4ca480930f
author Brian Carlstrom <bdc@google.com> Mon Aug 29 20:08:52 2011 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 29 23:29:56 2011 -0700
tree bbab3d50aa6eebb2a8182a7dac0caf7046104a1a
parent a19f2a5240fcf5baf989a26c7a6cf37247432c1b

Allow compilation of classes in different ClassLoaders

Change-Id: Ib0420471590a4c6d16bc25285ef3876098eacb36

src/object.h

diff --git a/src/object.h b/src/object.h
index 1df10ad..2d07bd5 100644
--- a/src/object.h
+++ b/src/object.h
@@ -872,9 +872,8 @@
 // ClassLoader objects.
 class ClassLoader : public Object {
  public:
-  const std::vector<const DexFile*>& GetClassPath() const {
-    return class_path_;
-  }
+  static const std::vector<const DexFile*>& GetClassPath(const ClassLoader* class_loader);
+
   void SetClassPath(std::vector<const DexFile*>& class_path) {
     DCHECK_EQ(0U, class_path_.size());
     class_path_ = class_path;
@@ -901,7 +900,7 @@
 
 class PathClassLoader : public BaseDexClassLoader {
  public:
-  static PathClassLoader* Alloc(std::vector<const DexFile*> dex_files);
+  static const PathClassLoader* Alloc(std::vector<const DexFile*> dex_files);
   static void SetClass(Class* dalvik_system_PathClassLoader);
   static void ResetClass();
  private: