Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h
index 4e1c253..5310c18 100644
--- a/runtime/gc/accounting/atomic_stack.h
+++ b/runtime/gc/accounting/atomic_stack.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_
-#define ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_
+#define ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_
#include <string>
@@ -189,4 +189,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_ATOMIC_STACK_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_ATOMIC_STACK_H_
diff --git a/runtime/gc/accounting/card_table-inl.h b/runtime/gc/accounting/card_table-inl.h
index 1e75290..f8f2773 100644
--- a/runtime/gc/accounting/card_table-inl.h
+++ b/runtime/gc/accounting/card_table-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_CARDTABLE_INL_H_
-#define ART_SRC_GC_CARDTABLE_INL_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_
+#define ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_
#include "base/logging.h"
#include "card_table.h"
@@ -210,4 +210,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_CARDTABLE_INL_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_INL_H_
diff --git a/runtime/gc/accounting/card_table.h b/runtime/gc/accounting/card_table.h
index cf85d15..1acaf5b 100644
--- a/runtime/gc/accounting/card_table.h
+++ b/runtime/gc/accounting/card_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_CARDTABLE_H_
-#define ART_SRC_GC_CARDTABLE_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_
+#define ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_
#include "globals.h"
#include "locks.h"
@@ -153,4 +153,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_CARDTABLE_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_CARD_TABLE_H_
diff --git a/runtime/gc/accounting/heap_bitmap-inl.h b/runtime/gc/accounting/heap_bitmap-inl.h
index 8e3123b..7622604 100644
--- a/runtime/gc/accounting/heap_bitmap-inl.h
+++ b/runtime/gc/accounting/heap_bitmap-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
-#define ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
+#define ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
#include "heap_bitmap.h"
@@ -47,4 +47,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_INL_H_
diff --git a/runtime/gc/accounting/heap_bitmap.h b/runtime/gc/accounting/heap_bitmap.h
index 5ff40c6..a12809e 100644
--- a/runtime/gc/accounting/heap_bitmap.h
+++ b/runtime/gc/accounting/heap_bitmap.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_
-#define ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_
+#define ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_
#include "base/logging.h"
#include "locks.h"
@@ -126,4 +126,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_HEAP_BITMAP_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_HEAP_BITMAP_H_
diff --git a/runtime/gc/accounting/mod_union_table-inl.h b/runtime/gc/accounting/mod_union_table-inl.h
index 656af94..32ac95f 100644
--- a/runtime/gc/accounting/mod_union_table-inl.h
+++ b/runtime/gc/accounting/mod_union_table-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_MOD_UNION_TABLE_INL_H_
-#define ART_SRC_GC_MOD_UNION_TABLE_INL_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_
+#define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_
#include "mod_union_table.h"
@@ -72,4 +72,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_MOD_UNION_TABLE_INL_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_INL_H_
diff --git a/runtime/gc/accounting/mod_union_table.h b/runtime/gc/accounting/mod_union_table.h
index 5d25e05..5435625 100644
--- a/runtime/gc/accounting/mod_union_table.h
+++ b/runtime/gc/accounting/mod_union_table.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_
-#define ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
+#define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
#include "globals.h"
#include "safe_map.h"
@@ -150,4 +150,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_MOD_UNION_TABLE_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_
diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h
index a4fd330..d074a0f 100644
--- a/runtime/gc/accounting/space_bitmap-inl.h
+++ b/runtime/gc/accounting/space_bitmap-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
-#define ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
+#define ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
#include "base/logging.h"
#include "cutils/atomic-inline.h"
@@ -144,4 +144,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_INL_H_
diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h
index bb487d8..32ab440 100644
--- a/runtime/gc/accounting/space_bitmap.h
+++ b/runtime/gc/accounting/space_bitmap.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_
-#define ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_
+#ifndef ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_
+#define ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_
#include "locks.h"
#include "globals.h"
@@ -262,4 +262,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_ACCOUNTING_SPACE_BITMAP_H_
+#endif // ART_RUNTIME_GC_ACCOUNTING_SPACE_BITMAP_H_
diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index 6b02a44..07ebd1c 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_ALLOCATOR_DLMALLOC_H_
-#define ART_SRC_GC_ALLOCATOR_DLMALLOC_H_
+#ifndef ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_
+#define ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_
// Configure dlmalloc for mspaces.
#define HAVE_MMAP 0
@@ -37,4 +37,4 @@
// pages back to the kernel.
extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* /*arg*/);
-#endif // ART_SRC_GC_ALLOCATOR_DLMALLOC_H_
+#endif // ART_RUNTIME_GC_ALLOCATOR_DLMALLOC_H_
diff --git a/runtime/gc/collector/garbage_collector.h b/runtime/gc/collector/garbage_collector.h
index 1ab3957..a22faac 100644
--- a/runtime/gc/collector/garbage_collector.h
+++ b/runtime/gc/collector/garbage_collector.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_GARBAGE_COLLECTOR_H_
-#define ART_SRC_GC_GARBAGE_COLLECTOR_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_
+#define ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_
#include "gc_type.h"
#include "locks.h"
@@ -119,4 +119,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_GARBAGE_COLLECTOR_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_GARBAGE_COLLECTOR_H_
diff --git a/runtime/gc/collector/gc_type.h b/runtime/gc/collector/gc_type.h
index bb25bb9..f18e40f 100644
--- a/runtime/gc/collector/gc_type.h
+++ b/runtime/gc/collector/gc_type.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_COLLECTOR_GC_TYPE_H_
-#define ART_SRC_GC_COLLECTOR_GC_TYPE_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_
+#define ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_
#include <ostream>
@@ -43,4 +43,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_COLLECTOR_GC_TYPE_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_GC_TYPE_H_
diff --git a/runtime/gc/collector/mark_sweep-inl.h b/runtime/gc/collector/mark_sweep-inl.h
index ea9fced..6b1b617 100644
--- a/runtime/gc/collector/mark_sweep-inl.h
+++ b/runtime/gc/collector/mark_sweep-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_MARK_SWEEP_INL_H_
-#define ART_SRC_GC_MARK_SWEEP_INL_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_INL_H_
+#define ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_INL_H_
#include "gc/collector/mark_sweep.h"
@@ -162,4 +162,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_MARK_SWEEP_INL_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_INL_H_
diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h
index 9df3c19..34136d4 100644
--- a/runtime/gc/collector/mark_sweep.h
+++ b/runtime/gc/collector/mark_sweep.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_MARK_SWEEP_H_
-#define ART_SRC_GC_MARK_SWEEP_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_H_
+#define ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_H_
#include "atomic_integer.h"
#include "barrier.h"
@@ -450,4 +450,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_MARK_SWEEP_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_MARK_SWEEP_H_
diff --git a/runtime/gc/collector/partial_mark_sweep.h b/runtime/gc/collector/partial_mark_sweep.h
index bd4a580..718c62e 100644
--- a/runtime/gc/collector/partial_mark_sweep.h
+++ b/runtime/gc/collector/partial_mark_sweep.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
-#define ART_SRC_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
+#define ART_RUNTIME_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
#include "locks.h"
#include "mark_sweep.h"
@@ -45,4 +45,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_PARTIAL_MARK_SWEEP_H_
diff --git a/runtime/gc/collector/sticky_mark_sweep.h b/runtime/gc/collector/sticky_mark_sweep.h
index b16cfc1..8cd4aed 100644
--- a/runtime/gc/collector/sticky_mark_sweep.h
+++ b/runtime/gc/collector/sticky_mark_sweep.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_STICKY_MARK_SWEEP_H_
-#define ART_SRC_GC_STICKY_MARK_SWEEP_H_
+#ifndef ART_RUNTIME_GC_COLLECTOR_STICKY_MARK_SWEEP_H_
+#define ART_RUNTIME_GC_COLLECTOR_STICKY_MARK_SWEEP_H_
#include "base/macros.h"
#include "locks.h"
@@ -52,4 +52,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_STICKY_MARK_SWEEP_H_
+#endif // ART_RUNTIME_GC_COLLECTOR_STICKY_MARK_SWEEP_H_
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index e6c9221..630d063 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_HEAP_H_
-#define ART_SRC_GC_HEAP_H_
+#ifndef ART_RUNTIME_GC_HEAP_H_
+#define ART_RUNTIME_GC_HEAP_H_
#include <iosfwd>
#include <string>
@@ -609,4 +609,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_HEAP_H_
+#endif // ART_RUNTIME_GC_HEAP_H_
diff --git a/runtime/gc/space/dlmalloc_space.h b/runtime/gc/space/dlmalloc_space.h
index 00df0e6..8a4314c 100644
--- a/runtime/gc/space/dlmalloc_space.h
+++ b/runtime/gc/space/dlmalloc_space.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_
-#define ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_
+#ifndef ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_
+#define ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_
#include "gc/allocator/dlmalloc.h"
#include "space.h"
@@ -182,4 +182,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_SPACE_DLMALLOC_SPACE_H_
+#endif // ART_RUNTIME_GC_SPACE_DLMALLOC_SPACE_H_
diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h
index 833fb8d..fde2b41 100644
--- a/runtime/gc/space/image_space.h
+++ b/runtime/gc/space/image_space.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_SPACE_IMAGE_SPACE_H_
-#define ART_SRC_GC_SPACE_IMAGE_SPACE_H_
+#ifndef ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_
+#define ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_
#include "space.h"
@@ -115,4 +115,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_SPACE_IMAGE_SPACE_H_
+#endif // ART_RUNTIME_GC_SPACE_IMAGE_SPACE_H_
diff --git a/runtime/gc/space/large_object_space.h b/runtime/gc/space/large_object_space.h
index 197fad3..74d9cca 100644
--- a/runtime/gc/space/large_object_space.h
+++ b/runtime/gc/space/large_object_space.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_
-#define ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_
+#ifndef ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_
+#define ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_
#include "dlmalloc_space.h"
@@ -190,4 +190,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_SPACE_LARGE_OBJECT_SPACE_H_
+#endif // ART_RUNTIME_GC_SPACE_LARGE_OBJECT_SPACE_H_
diff --git a/runtime/gc/space/space-inl.h b/runtime/gc/space/space-inl.h
index 54bf604..2c3b93c 100644
--- a/runtime/gc/space/space-inl.h
+++ b/runtime/gc/space/space-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_SPACE_SPACE_INL_H_
-#define ART_SRC_GC_SPACE_SPACE_INL_H_
+#ifndef ART_RUNTIME_GC_SPACE_SPACE_INL_H_
+#define ART_RUNTIME_GC_SPACE_SPACE_INL_H_
#include "space.h"
@@ -45,4 +45,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_SPACE_SPACE_INL_H_
+#endif // ART_RUNTIME_GC_SPACE_SPACE_INL_H_
diff --git a/runtime/gc/space/space.h b/runtime/gc/space/space.h
index ca01c55..48f0579 100644
--- a/runtime/gc/space/space.h
+++ b/runtime/gc/space/space.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_GC_SPACE_SPACE_H_
-#define ART_SRC_GC_SPACE_SPACE_H_
+#ifndef ART_RUNTIME_GC_SPACE_SPACE_H_
+#define ART_RUNTIME_GC_SPACE_SPACE_H_
#include <string>
@@ -292,4 +292,4 @@
} // namespace gc
} // namespace art
-#endif // ART_SRC_GC_SPACE_SPACE_H_
+#endif // ART_RUNTIME_GC_SPACE_SPACE_H_