commit 9aa352e92b6ca0f2250cb7f54dfbf4b1be714c19
author David Sehr <sehr@google.com> Thu Sep 15 18:13:52 2016 -0700
committer David Sehr <sehr@google.com> Fri Sep 16 16:31:19 2016 -0700
tree 647b9274daa64b3497c202da4327be26fe4e494b
parent 47c22ff721503c0eb325508450663adacf0bd377

Remove TypeLookupTable from DexFile.

One more step towards removing runtime dependencies from the DexFile
API.  This severs the ties to OatFile.  Work remains to move MemMap out
of DexFile.

Bug: 22322814
Change-Id: I29e7ad8fd292c7919ed2689dc754b958b88d6819
Test: test-art-host

runtime/native/dalvik_system_DexFile.cc

diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index b2349fc..384de34 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -270,7 +270,8 @@
   const std::string descriptor(DotToDescriptor(class_name.c_str()));
   const size_t hash(ComputeModifiedUtf8Hash(descriptor.c_str()));
   for (auto& dex_file : dex_files) {
-    const DexFile::ClassDef* dex_class_def = dex_file->FindClassDef(descriptor.c_str(), hash);
+    const DexFile::ClassDef* dex_class_def =
+        OatDexFile::FindClassDef(*dex_file, descriptor.c_str(), hash);
     if (dex_class_def != nullptr) {
       ScopedObjectAccess soa(env);
       ClassLinker* class_linker = Runtime::Current()->GetClassLinker();

runtime/native/dalvik_system_InMemoryDexClassLoader_DexData.cc

diff --git a/runtime/native/dalvik_system_InMemoryDexClassLoader_DexData.cc b/runtime/native/dalvik_system_InMemoryDexClassLoader_DexData.cc
index 1761799..94933bc 100644
--- a/runtime/native/dalvik_system_InMemoryDexClassLoader_DexData.cc
+++ b/runtime/native/dalvik_system_InMemoryDexClassLoader_DexData.cc
@@ -23,6 +23,7 @@
 #include "mem_map.h"
 #include "mirror/class_loader.h"
 #include "mirror/object-inl.h"
+#include "oat_file.h"
 #include "scoped_thread_state_change.h"
 #include "ScopedUtfChars.h"
 
@@ -140,7 +141,8 @@
   const char* class_descriptor = descriptor.c_str();
   const size_t hash = ComputeModifiedUtf8Hash(class_descriptor);
   const DexFile* dex_file = CookieToDexFile(cookie);
-  const DexFile::ClassDef* dex_class_def = dex_file->FindClassDef(class_descriptor, hash);
+  const DexFile::ClassDef* dex_class_def =
+      OatDexFile::FindClassDef(*dex_file, class_descriptor, hash);
   if (dex_class_def != nullptr) {
     ScopedObjectAccess soa(env);
     ClassLinker* class_linker = Runtime::Current()->GetClassLinker();