commit 79e2607ab50163bfdc283f4a49decec26a216df5
author David Sehr <sehr@google.com> Fri Apr 06 17:58:50 2018 -0700
committer David Sehr <sehr@google.com> Fri Apr 13 08:29:30 2018 -0700
tree 0cdb2c65412b64a55ddf1a486ab3d961a0301a3e
parent b4b91460b2d01d36ddcb7d55111ccd8faf390c2a

Move profile dependent modules to libartbase

Move mem_map and zip_archive to libartbase.  This should be the last two
remaining modules that profile_compilation_info is dependent upon.

Bug: 22322814
Test: make -j 50 checkbuild
      make and boot a device

Change-Id: I136ee23e426aa8ec7441e3d3f1978f1bebf4b562

openjdkjvmti/ti_class_definition.h

diff --git a/openjdkjvmti/ti_class_definition.h b/openjdkjvmti/ti_class_definition.h
index 31c3611..f888a74 100644
--- a/openjdkjvmti/ti_class_definition.h
+++ b/openjdkjvmti/ti_class_definition.h
@@ -39,7 +39,7 @@
 #include "art_jvmti.h"
 
 #include "base/array_ref.h"
-#include "mem_map.h"
+#include "base/mem_map.h"
 
 namespace openjdkjvmti {
 

openjdkjvmti/ti_class_loader.h

diff --git a/openjdkjvmti/ti_class_loader.h b/openjdkjvmti/ti_class_loader.h
index 5c9497b..dbe30da 100644
--- a/openjdkjvmti/ti_class_loader.h
+++ b/openjdkjvmti/ti_class_loader.h
@@ -39,6 +39,7 @@
 #include "art_jvmti.h"
 #include "art_method.h"
 #include "base/array_slice.h"
+#include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "dex/utf.h"
@@ -47,7 +48,6 @@
 #include "jni_env_ext-inl.h"
 #include "jvmti.h"
 #include "linear_alloc.h"
-#include "mem_map.h"
 #include "mirror/array-inl.h"
 #include "mirror/array.h"
 #include "mirror/class-inl.h"

openjdkjvmti/ti_redefine.h

diff --git a/openjdkjvmti/ti_redefine.h b/openjdkjvmti/ti_redefine.h
index 778f87e..a8877f8 100644
--- a/openjdkjvmti/ti_redefine.h
+++ b/openjdkjvmti/ti_redefine.h
@@ -39,6 +39,7 @@
 #include "art_jvmti.h"
 #include "art_method.h"
 #include "base/array_ref.h"
+#include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "dex/utf.h"
@@ -47,7 +48,6 @@
 #include "jni_env_ext-inl.h"
 #include "jvmti.h"
 #include "linear_alloc.h"
-#include "mem_map.h"
 #include "mirror/array-inl.h"
 #include "mirror/array.h"
 #include "mirror/class-inl.h"

openjdkjvmti/transform.cc

diff --git a/openjdkjvmti/transform.cc b/openjdkjvmti/transform.cc
index 43b8fe9..e88ecef 100644
--- a/openjdkjvmti/transform.cc
+++ b/openjdkjvmti/transform.cc
@@ -39,6 +39,7 @@
 
 #include "art_method.h"
 #include "base/array_ref.h"
+#include "base/mem_map.h"
 #include "class_linker.h"
 #include "dex/dex_file.h"
 #include "dex/dex_file_types.h"
@@ -51,7 +52,6 @@
 #include "jvalue.h"
 #include "jvmti.h"
 #include "linear_alloc.h"
-#include "mem_map.h"
 #include "mirror/array.h"
 #include "mirror/class-inl.h"
 #include "mirror/class_ext.h"