diff options
| author | 2016-11-01 10:30:44 -0700 | |
|---|---|---|
| committer | 2016-11-01 10:58:52 -0700 | |
| commit | ba8df69bf84803f868107833ce9afe1144b7dfec (patch) | |
| tree | 8787d920b414fdc5885f71a14c5690813b3cf02d | |
| parent | 195ea635e60f930a0df9acb91b1efc828e165633 (diff) | |
ART: Rename heap support file
Differentiate it from the runtime naming.
Bug: 32516268
Test: m test-art-host
Change-Id: I19a09933ada0f312930255a22f306527ce3b89db
| -rw-r--r-- | runtime/openjdkjvmti/Android.bp | 2 | ||||
| -rw-r--r-- | runtime/openjdkjvmti/OpenjdkJvmTi.cc | 2 | ||||
| -rw-r--r-- | runtime/openjdkjvmti/ti_heap.cc (renamed from runtime/openjdkjvmti/heap.cc) | 2 | ||||
| -rw-r--r-- | runtime/openjdkjvmti/ti_heap.h (renamed from runtime/openjdkjvmti/heap.h) | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/runtime/openjdkjvmti/Android.bp b/runtime/openjdkjvmti/Android.bp index 5095cfd790..b323aef0db 100644 --- a/runtime/openjdkjvmti/Android.bp +++ b/runtime/openjdkjvmti/Android.bp @@ -18,10 +18,10 @@ cc_defaults { defaults: ["art_defaults"], host_supported: true, srcs: ["events.cc", - "heap.cc", "object_tagging.cc", "OpenjdkJvmTi.cc", "ti_class.cc", + "ti_heap.cc", "ti_method.cc", "ti_stack.cc", "transform.cc"], diff --git a/runtime/openjdkjvmti/OpenjdkJvmTi.cc b/runtime/openjdkjvmti/OpenjdkJvmTi.cc index d867727b88..d9031ea652 100644 --- a/runtime/openjdkjvmti/OpenjdkJvmTi.cc +++ b/runtime/openjdkjvmti/OpenjdkJvmTi.cc @@ -39,7 +39,6 @@ #include "art_jvmti.h" #include "base/mutex.h" #include "events-inl.h" -#include "heap.h" #include "jni_env_ext-inl.h" #include "object_tagging.h" #include "obj_ptr-inl.h" @@ -48,6 +47,7 @@ #include "thread_list.h" #include "thread-inl.h" #include "ti_class.h" +#include "ti_heap.h" #include "ti_method.h" #include "ti_stack.h" #include "transform.h" diff --git a/runtime/openjdkjvmti/heap.cc b/runtime/openjdkjvmti/ti_heap.cc index df33abdf81..6b207430ff 100644 --- a/runtime/openjdkjvmti/heap.cc +++ b/runtime/openjdkjvmti/ti_heap.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "heap.h" +#include "ti_heap.h" #include "art_jvmti.h" #include "base/macros.h" diff --git a/runtime/openjdkjvmti/heap.h b/runtime/openjdkjvmti/ti_heap.h index b0c7f6f9ce..570dd0c6ce 100644 --- a/runtime/openjdkjvmti/heap.h +++ b/runtime/openjdkjvmti/ti_heap.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OPENJDKJVMTI_HEAP_H_ -#define ART_RUNTIME_OPENJDKJVMTI_HEAP_H_ +#ifndef ART_RUNTIME_OPENJDKJVMTI_TI_HEAP_H_ +#define ART_RUNTIME_OPENJDKJVMTI_TI_HEAP_H_ #include "jvmti.h" @@ -48,4 +48,4 @@ class HeapUtil { } // namespace openjdkjvmti -#endif // ART_RUNTIME_OPENJDKJVMTI_HEAP_H_ +#endif // ART_RUNTIME_OPENJDKJVMTI_TI_HEAP_H_ |