commit b384e5e845adc60915294844c80e574c853ae4be
author Mathieu Chartier <mathieuc@google.com> Fri Apr 29 12:03:56 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon May 02 09:21:11 2016 -0700
tree 58b1b9651f595efe772db7b61351bfd971699306
parent 808d6d019edf692817b2506093d3c1b8d6fb705a

Fix profile saver to use base dex location

Previously we were using the dex location. This only matches the
base location for the main dex file, and resulted in only the
main dex file to have classes recorded.

Bug: 28463739

(cherry picked from commit 9275af6ec0d71d1a13a97a1d292806b73f755717)

Change-Id: Ie822c2a38fd1316c3ba604b8625c48388f6a8c07

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 17c41bb..a147aba 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -7986,6 +7986,7 @@
     VLOG(class_linker) << "Collecting class profile for dex file " << location
                        << " types=" << num_types << " class_defs=" << num_class_defs;
     DexCacheResolvedClasses resolved_classes(dex_file->GetLocation(),
+                                             dex_file->GetBaseLocation(),
                                              dex_file->GetLocationChecksum());
     size_t num_resolved = 0;
     std::unordered_set<uint16_t> class_set;