ART: Clean up jit_code_cache.h
Refactor to reduce transitive includes.
Test: mmma art
Change-Id: I32caf422dc9a59b8e3d495b88b182f072ef4de84
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index b1cd5c0..3d7fe89 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -21,6 +21,7 @@
#include "arch/context.h"
#include "art_method-inl.h"
#include "base/enums.h"
+#include "base/histogram-inl.h"
#include "base/logging.h" // For VLOG.
#include "base/mem_map.h"
#include "base/quasi_atomic.h"
@@ -30,10 +31,12 @@
#include "cha.h"
#include "debugger_interface.h"
#include "dex/dex_file_loader.h"
+#include "dex/method_reference.h"
#include "entrypoints/runtime_asm_entrypoints.h"
#include "gc/accounting/bitmap-inl.h"
#include "gc/scoped_gc_critical_section.h"
#include "handle.h"
+#include "instrumentation.h"
#include "intern_table.h"
#include "jit/jit.h"
#include "jit/profiling_info.h"
diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h
index 958e8e8..b056bc3 100644
--- a/runtime/jit/jit_code_cache.h
+++ b/runtime/jit/jit_code_cache.h
@@ -17,16 +17,19 @@
#ifndef ART_RUNTIME_JIT_JIT_CODE_CACHE_H_
#define ART_RUNTIME_JIT_JIT_CODE_CACHE_H_
-#include "instrumentation.h"
+#include <iosfwd>
+#include <memory>
+#include <set>
+#include <string>
+#include <unordered_set>
+#include <vector>
#include "base/arena_containers.h"
#include "base/atomic.h"
-#include "base/histogram-inl.h"
+#include "base/histogram.h"
#include "base/macros.h"
#include "base/mutex.h"
#include "base/safe_map.h"
-#include "dex/method_reference.h"
-#include "gc_root.h"
namespace art {
@@ -36,6 +39,7 @@
class InlineCache;
class IsMarkedVisitor;
class JitJniStubTestHelper;
+class MemMap;
class OatQuickMethodHeader;
struct ProfileMethodInfo;
class ProfilingInfo;