Fix multiple inclusion guards to match new pathnames

Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43

21 files changed, 63 insertions, 63 deletions

diff --git a/runtime/mirror/abstract_method-inl.h b/runtime/mirror/abstract_method-inl.h
index a823886..6fcd705 100644
--- a/runtime/mirror/abstract_method-inl.h
+++ b/runtime/mirror/abstract_method-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_METHOD_INL_H_
-#define ART_SRC_MIRROR_METHOD_INL_H_
+#ifndef ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_
+#define ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_
 
 #include "abstract_method.h"
 
@@ -196,4 +196,4 @@ inline bool AbstractMethod::IsResolutionMethod() const {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_METHOD_INL_H_
+#endif  // ART_RUNTIME_MIRROR_ABSTRACT_METHOD_INL_H_
diff --git a/runtime/mirror/abstract_method.h b/runtime/mirror/abstract_method.h
index 339471d..d909058 100644
--- a/runtime/mirror/abstract_method.h
+++ b/runtime/mirror/abstract_method.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_METHOD_H_
-#define ART_SRC_MIRROR_METHOD_H_
+#ifndef ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_
+#define ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_
 
 #include "class.h"
 #include "dex_file.h"
@@ -515,4 +515,4 @@ class MANAGED AbstractMethodClass : public Class {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_METHOD_H_
+#endif  // ART_RUNTIME_MIRROR_ABSTRACT_METHOD_H_
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h
index b7f212f..eb73c7d 100644
--- a/runtime/mirror/array-inl.h
+++ b/runtime/mirror/array-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_ARRAY_INL_H_
-#define ART_SRC_MIRROR_ARRAY_INL_H_
+#ifndef ART_RUNTIME_MIRROR_ARRAY_INL_H_
+#define ART_RUNTIME_MIRROR_ARRAY_INL_H_
 
 #include "array.h"
 
@@ -36,4 +36,4 @@ inline size_t Array::SizeOf() const {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_ARRAY_INL_H_
+#endif  // ART_RUNTIME_MIRROR_ARRAY_INL_H_
diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h
index 98b8ea0..b195a87 100644
--- a/runtime/mirror/array.h
+++ b/runtime/mirror/array.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_ARRAY_H_
-#define ART_SRC_MIRROR_ARRAY_H_
+#ifndef ART_RUNTIME_MIRROR_ARRAY_H_
+#define ART_RUNTIME_MIRROR_ARRAY_H_
 
 #include "object.h"
 
@@ -145,4 +145,4 @@ class MANAGED PrimitiveArray : public Array {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_ARRAY_H_
+#endif  // ART_RUNTIME_MIRROR_ARRAY_H_
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index 6819fb2..d323c33 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_CLASS_INL_H_
-#define ART_SRC_MIRROR_CLASS_INL_H_
+#ifndef ART_RUNTIME_MIRROR_CLASS_INL_H_
+#define ART_RUNTIME_MIRROR_CLASS_INL_H_
 
 #include "class.h"
 
@@ -346,4 +346,4 @@ inline void Class::SetName(String* name) {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_CLASS_INL_H_
+#endif  // ART_RUNTIME_MIRROR_CLASS_INL_H_
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 084aa24..9a506c2 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_CLASS_H_
-#define ART_SRC_MIRROR_CLASS_H_
+#ifndef ART_RUNTIME_MIRROR_CLASS_H_
+#define ART_RUNTIME_MIRROR_CLASS_H_
 
 #include "modifiers.h"
 #include "object.h"
@@ -882,4 +882,4 @@ class MANAGED ClassClass : public Class {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_CLASS_H_
+#endif  // ART_RUNTIME_MIRROR_CLASS_H_
diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h
index 0d635f1..415cb67 100644
--- a/runtime/mirror/class_loader.h
+++ b/runtime/mirror/class_loader.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_CLASS_LOADER_H_
-#define ART_SRC_CLASS_LOADER_H_
+#ifndef ART_RUNTIME_MIRROR_CLASS_LOADER_H_
+#define ART_RUNTIME_MIRROR_CLASS_LOADER_H_
 
 #include <vector>
 
@@ -43,4 +43,4 @@ class MANAGED ClassLoader : public Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_CLASS_LOADER_H_
+#endif  // ART_RUNTIME_MIRROR_CLASS_LOADER_H_
diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h
index 3b17c42..369dc49 100644
--- a/runtime/mirror/dex_cache-inl.h
+++ b/runtime/mirror/dex_cache-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_DEX_CACHE_INL_H_
-#define ART_SRC_MIRROR_DEX_CACHE_INL_H_
+#ifndef ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_
+#define ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_
 
 #include "dex_cache.h"
 
@@ -37,4 +37,4 @@ inline AbstractMethod* DexCache::GetResolvedMethod(uint32_t method_idx) const
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_DEX_CACHE_INL_H_
+#endif  // ART_RUNTIME_MIRROR_DEX_CACHE_INL_H_
diff --git a/runtime/mirror/dex_cache.h b/runtime/mirror/dex_cache.h
index 307588b..fd3f5f4 100644
--- a/runtime/mirror/dex_cache.h
+++ b/runtime/mirror/dex_cache.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_DEX_CACHE_H_
-#define ART_SRC_MIRROR_DEX_CACHE_H_
+#ifndef ART_RUNTIME_MIRROR_DEX_CACHE_H_
+#define ART_RUNTIME_MIRROR_DEX_CACHE_H_
 
 #include "abstract_method.h"
 #include "class.h"
@@ -179,4 +179,4 @@ class MANAGED DexCache : public Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_DEX_CACHE_H_
+#endif  // ART_RUNTIME_MIRROR_DEX_CACHE_H_
diff --git a/runtime/mirror/field-inl.h b/runtime/mirror/field-inl.h
index be5dcab..3e3d6db 100644
--- a/runtime/mirror/field-inl.h
+++ b/runtime/mirror/field-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_FIELD_INL_H_
-#define ART_SRC_MIRROR_FIELD_INL_H_
+#ifndef ART_RUNTIME_MIRROR_FIELD_INL_H_
+#define ART_RUNTIME_MIRROR_FIELD_INL_H_
 
 #include "field.h"
 
@@ -218,4 +218,4 @@ inline void Field::SetObject(Object* object, const Object* l) const {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_FIELD_INL_H_
+#endif  // ART_RUNTIME_MIRROR_FIELD_INL_H_
diff --git a/runtime/mirror/field.h b/runtime/mirror/field.h
index 4e7abe8..6e508a3 100644
--- a/runtime/mirror/field.h
+++ b/runtime/mirror/field.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_FIELD_H_
-#define ART_SRC_MIRROR_FIELD_H_
+#ifndef ART_RUNTIME_MIRROR_FIELD_H_
+#define ART_RUNTIME_MIRROR_FIELD_H_
 
 #include "class.h"
 #include "modifiers.h"
@@ -165,4 +165,4 @@ class MANAGED FieldClass : public Class {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_FIELD_H_
+#endif  // ART_RUNTIME_MIRROR_FIELD_H_
diff --git a/runtime/mirror/iftable-inl.h b/runtime/mirror/iftable-inl.h
index 72803b8..9d5fa74 100644
--- a/runtime/mirror/iftable-inl.h
+++ b/runtime/mirror/iftable-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_IFTABLE_INL_H_
-#define ART_SRC_MIRROR_IFTABLE_INL_H_
+#ifndef ART_RUNTIME_MIRROR_IFTABLE_INL_H_
+#define ART_RUNTIME_MIRROR_IFTABLE_INL_H_
 
 #include "iftable.h"
 
@@ -32,4 +32,4 @@ inline void IfTable::SetInterface(int32_t i, Class* interface) {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_IFTABLE_INL_H_
+#endif  // ART_RUNTIME_MIRROR_IFTABLE_INL_H_
diff --git a/runtime/mirror/iftable.h b/runtime/mirror/iftable.h
index ffb2e51..aea8fdd 100644
--- a/runtime/mirror/iftable.h
+++ b/runtime/mirror/iftable.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_IFTABLE_H_
-#define ART_SRC_MIRROR_IFTABLE_H_
+#ifndef ART_RUNTIME_MIRROR_IFTABLE_H_
+#define ART_RUNTIME_MIRROR_IFTABLE_H_
 
 #include "object_array.h"
 
@@ -76,4 +76,4 @@ class MANAGED IfTable : public ObjectArray<Object> {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_IFTABLE_H_
+#endif  // ART_RUNTIME_MIRROR_IFTABLE_H_
diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h
index 1a91dd3..5818a80 100644
--- a/runtime/mirror/object-inl.h
+++ b/runtime/mirror/object-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_OBJECT_INL_H_
-#define ART_SRC_MIRROR_OBJECT_INL_H_
+#ifndef ART_RUNTIME_MIRROR_OBJECT_INL_H_
+#define ART_RUNTIME_MIRROR_OBJECT_INL_H_
 
 #include "object.h"
 
@@ -272,4 +272,4 @@ inline void Object::VerifyObject(const Object* obj) {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_OBJECT_INL_H_
+#endif  // ART_RUNTIME_MIRROR_OBJECT_INL_H_
diff --git a/runtime/mirror/object.h b/runtime/mirror/object.h
index 71b628d..a40c906 100644
--- a/runtime/mirror/object.h
+++ b/runtime/mirror/object.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_OBJECT_H_
-#define ART_SRC_MIRROR_OBJECT_H_
+#ifndef ART_RUNTIME_MIRROR_OBJECT_H_
+#define ART_RUNTIME_MIRROR_OBJECT_H_
 
 #include "base/casts.h"
 #include "base/logging.h"
@@ -260,4 +260,4 @@ class MANAGED Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_OBJECT_H_
+#endif  // ART_RUNTIME_MIRROR_OBJECT_H_
diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h
index b130dac..8675c31 100644
--- a/runtime/mirror/object_array-inl.h
+++ b/runtime/mirror/object_array-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_OBJECT_ARRAY_INL_H_
-#define ART_SRC_MIRROR_OBJECT_ARRAY_INL_H_
+#ifndef ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_
+#define ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_
 
 #include "object_array.h"
 
@@ -142,4 +142,4 @@ inline ObjectArray<T>* ObjectArray<T>::CopyOf(Thread* self, int32_t new_length)
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_OBJET_ARRAY_INL_H_
+#endif  // ART_RUNTIME_MIRROR_OBJECT_ARRAY_INL_H_
diff --git a/runtime/mirror/object_array.h b/runtime/mirror/object_array.h
index 08a8d62..09ff519 100644
--- a/runtime/mirror/object_array.h
+++ b/runtime/mirror/object_array.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_OBJECT_ARRAY_H_
-#define ART_SRC_MIRROR_OBJECT_ARRAY_H_
+#ifndef ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_
+#define ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_
 
 #include "array.h"
 
@@ -61,4 +61,4 @@ class MANAGED ObjectArray : public Array {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_OBJECT_ARRAY_H_
+#endif  // ART_RUNTIME_MIRROR_OBJECT_ARRAY_H_
diff --git a/runtime/mirror/proxy.h b/runtime/mirror/proxy.h
index cac028a..7c5bc39 100644
--- a/runtime/mirror/proxy.h
+++ b/runtime/mirror/proxy.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_PROXY_H_
-#define ART_SRC_MIRROR_PROXY_H_
+#ifndef ART_RUNTIME_MIRROR_PROXY_H_
+#define ART_RUNTIME_MIRROR_PROXY_H_
 
 #include "mirror/object.h"
 
@@ -52,4 +52,4 @@ class MANAGED Proxy : public Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_PROXY_H_
+#endif  // ART_RUNTIME_MIRROR_PROXY_H_
diff --git a/runtime/mirror/stack_trace_element.h b/runtime/mirror/stack_trace_element.h
index d53c860..a9751f9 100644
--- a/runtime/mirror/stack_trace_element.h
+++ b/runtime/mirror/stack_trace_element.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_
-#define ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_
+#ifndef ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_
+#define ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_
 
 #include "object.h"
 
@@ -80,4 +80,4 @@ class MANAGED StackTraceElement : public Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_STACK_TRACE_ELEMENT_H_
+#endif  // ART_RUNTIME_MIRROR_STACK_TRACE_ELEMENT_H_
diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h
index 8109dcb..bf545ea 100644
--- a/runtime/mirror/string.h
+++ b/runtime/mirror/string.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_STRING_H_
-#define ART_SRC_MIRROR_STRING_H_
+#ifndef ART_RUNTIME_MIRROR_STRING_H_
+#define ART_RUNTIME_MIRROR_STRING_H_
 
 #include "class.h"
 #include "gtest/gtest.h"
@@ -164,4 +164,4 @@ class MANAGED StringClass : public Class {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_STRING_H_
+#endif  // ART_RUNTIME_MIRROR_STRING_H_
diff --git a/runtime/mirror/throwable.h b/runtime/mirror/throwable.h
index aafcc07..909228e 100644
--- a/runtime/mirror/throwable.h
+++ b/runtime/mirror/throwable.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MIRROR_THROWABLE_H_
-#define ART_SRC_MIRROR_THROWABLE_H_
+#ifndef ART_RUNTIME_MIRROR_THROWABLE_H_
+#define ART_RUNTIME_MIRROR_THROWABLE_H_
 
 #include "object.h"
 #include "string.h"
@@ -72,4 +72,4 @@ class MANAGED Throwable : public Object {
 }  // namespace mirror
 }  // namespace art
 
-#endif  // ART_SRC_MIRROR_THROWABLE_H_
+#endif  // ART_RUNTIME_MIRROR_THROWABLE_H_