commit 87293d0500a72c098f046cd92695b154452cad9b
author Brian Carlstrom <bdc@google.com> Sun Apr 01 19:53:04 2012 -0700
committer Brian Carlstrom <bdc@google.com> Sun Apr 01 19:53:04 2012 -0700
tree e6ef8304ab08edfc06b35daad9d1333819ca820c
parent 33412de4cd8373c32bfe3bf8818a4920bc62b633

Tracking addition of BaseDexClassLoader.originalLibraryPath

Change-Id: I0210beec91b8a21f2c50d90dbd04b225bc5ecfe0

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 6fac6f8..07a9816 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -543,9 +543,9 @@
 struct ClassLoaderOffsets : public CheckOffsets<ClassLoader> {
   ClassLoaderOffsets() : CheckOffsets<ClassLoader>(false, "Ljava/lang/ClassLoader;") {
     // alphabetical references
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, packages_), "packages"));
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, parent_),   "parent"));
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, proxyCache_),   "proxyCache"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, packages_),   "packages"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, parent_),     "parent"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(ClassLoader, proxyCache_), "proxyCache"));
   };
 };
 
@@ -553,8 +553,9 @@
   BaseDexClassLoaderOffsets()
     : CheckOffsets<BaseDexClassLoader>(false, "Ldalvik/system/BaseDexClassLoader;") {
     // alphabetical references
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(BaseDexClassLoader, original_path_), "originalPath"));
-    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(BaseDexClassLoader, path_list_),     "pathList"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(BaseDexClassLoader, original_library_path_), "originalLibraryPath"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(BaseDexClassLoader, original_path_),         "originalPath"));
+    offsets.push_back(CheckOffset(OFFSETOF_MEMBER(BaseDexClassLoader, path_list_),             "pathList"));
   };
 };
 

src/class_loader.h

diff --git a/src/class_loader.h b/src/class_loader.h
index 8d1c696..0e1148d 100644
--- a/src/class_loader.h
+++ b/src/class_loader.h
@@ -40,6 +40,7 @@
 class MANAGED BaseDexClassLoader : public ClassLoader {
  private:
   // Field order required by test "ValidateFieldOrderOfJavaCppUnionClasses".
+  String* original_library_path_;
   String* original_path_;
   Object* path_list_;