commit 2f814aab42591b7b4093d79851d9d2920538a5ef
author Alex Light <allight@google.com> Fri Mar 24 15:21:34 2017 +0000
committer Alex Light <allight@google.com> Fri Mar 24 15:27:20 2017 -0700
tree 7ff34f1d63f8520208dd4689171968bbc59f983b
parent a7c04c4fe6623985ba2d0cca942d5e1e584f4358

Revert "Revert "Make original dex file be more deduplicated""

This reverts commit a7c04c4fe6623985ba2d0cca942d5e1e584f4358.

Reason for revert: Issue with target buildbots was fixed

Test: m clean && ./test.py --target -j8
Bug: 31455788

Change-Id: If00ef9433a9308810a40ea4e0d809987c934cef8

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 9f04e59..b421810 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -618,7 +618,7 @@
   ClassExtOffsets() : CheckOffsets<mirror::ClassExt>(false, "Ldalvik/system/ClassExt;") {
     addOffset(OFFSETOF_MEMBER(mirror::ClassExt, obsolete_dex_caches_), "obsoleteDexCaches");
     addOffset(OFFSETOF_MEMBER(mirror::ClassExt, obsolete_methods_), "obsoleteMethods");
-    addOffset(OFFSETOF_MEMBER(mirror::ClassExt, original_dex_file_bytes_), "originalDexFile");
+    addOffset(OFFSETOF_MEMBER(mirror::ClassExt, original_dex_file_), "originalDexFile");
     addOffset(OFFSETOF_MEMBER(mirror::ClassExt, verify_error_), "verifyError");
   }
 };