Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
diff --git a/runtime/oat/runtime/argument_visitor.h b/runtime/oat/runtime/argument_visitor.h
index 4ab05b9..d92ff19 100644
--- a/runtime/oat/runtime/argument_visitor.h
+++ b/runtime/oat/runtime/argument_visitor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_
-#define ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_
+#define ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_
#include "object_utils.h"
@@ -246,4 +246,4 @@
}
-#endif // ART_SRC_OAT_RUNTIME_ARGUMENT_VISITOR_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_ARGUMENT_VISITOR_H_
diff --git a/runtime/oat/runtime/arm/context_arm.h b/runtime/oat/runtime/arm/context_arm.h
index ec1d4cb..0be85e3 100644
--- a/runtime/oat/runtime/arm/context_arm.h
+++ b/runtime/oat/runtime/arm/context_arm.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
-#define ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
+#define ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
#include "locks.h"
#include "constants_arm.h"
@@ -64,4 +64,4 @@
} // namespace arm
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_ARM_CONTEXT_ARM_H_
diff --git a/runtime/oat/runtime/callee_save_frame.h b/runtime/oat/runtime/callee_save_frame.h
index dd2f3fa..59f46ac 100644
--- a/runtime/oat/runtime/callee_save_frame.h
+++ b/runtime/oat/runtime/callee_save_frame.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
-#define ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
+#define ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
#include "base/mutex.h"
#include "thread-inl.h"
@@ -38,4 +38,4 @@
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_CALLEE_SAVE_FRAME_H_
diff --git a/runtime/oat/runtime/context.h b/runtime/oat/runtime/context.h
index 895abf9..ac43e9a 100644
--- a/runtime/oat/runtime/context.h
+++ b/runtime/oat/runtime/context.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_CONTEXT_H_
-#define ART_SRC_OAT_RUNTIME_CONTEXT_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_
+#define ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_
#include <stddef.h>
#include <stdint.h>
@@ -67,4 +67,4 @@
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_CONTEXT_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_CONTEXT_H_
diff --git a/runtime/oat/runtime/mips/context_mips.h b/runtime/oat/runtime/mips/context_mips.h
index fc8ef96..f27124c 100644
--- a/runtime/oat/runtime/mips/context_mips.h
+++ b/runtime/oat/runtime/mips/context_mips.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
-#define ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
+#define ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
#include "constants_mips.h"
#include "oat/runtime/context.h"
@@ -61,4 +61,4 @@
} // namespace mips
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_MIPS_CONTEXT_MIPS_H_
diff --git a/runtime/oat/runtime/oat_support_entrypoints.h b/runtime/oat/runtime/oat_support_entrypoints.h
index c1a2587..546ee01 100644
--- a/runtime/oat/runtime/oat_support_entrypoints.h
+++ b/runtime/oat/runtime/oat_support_entrypoints.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
-#define ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
+#define ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
#include "dex_file-inl.h"
#include "runtime.h"
@@ -174,4 +174,4 @@
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_OAT_SUPPORT_ENTRYPOINTS_H_
diff --git a/runtime/oat/runtime/x86/context_x86.h b/runtime/oat/runtime/x86/context_x86.h
index 7928fd8..4ecfc51 100644
--- a/runtime/oat/runtime/x86/context_x86.h
+++ b/runtime/oat/runtime/x86/context_x86.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_
-#define ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_
+#ifndef ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_
+#define ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_
#include "constants_x86.h"
#include "oat/runtime/context.h"
@@ -64,4 +64,4 @@
} // namespace x86
} // namespace art
-#endif // ART_SRC_OAT_RUNTIME_X86_CONTEXT_X86_H_
+#endif // ART_RUNTIME_OAT_RUNTIME_X86_CONTEXT_X86_H_
diff --git a/runtime/oat/utils/arm/assembler_arm.h b/runtime/oat/utils/arm/assembler_arm.h
index 06e0a55..b8c79d21 100644
--- a/runtime/oat/utils/arm/assembler_arm.h
+++ b/runtime/oat/utils/arm/assembler_arm.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
-#define ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
+#ifndef ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
+#define ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
#include <vector>
@@ -656,4 +656,4 @@
} // namespace arm
} // namespace art
-#endif // ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
+#endif // ART_RUNTIME_OAT_UTILS_ARM_ASSEMBLER_ARM_H_
diff --git a/runtime/oat/utils/arm/managed_register_arm.h b/runtime/oat/utils/arm/managed_register_arm.h
index b069f6d..01596bb 100644
--- a/runtime/oat/utils/arm/managed_register_arm.h
+++ b/runtime/oat/utils/arm/managed_register_arm.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
-#define ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
+#ifndef ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
+#define ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
#include "base/logging.h"
#include "constants_arm.h"
@@ -271,4 +271,4 @@
} // namespace art
-#endif // ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
+#endif // ART_RUNTIME_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_
diff --git a/runtime/oat/utils/assembler.h b/runtime/oat/utils/assembler.h
index cbf145b..05e2732 100644
--- a/runtime/oat/utils/assembler.h
+++ b/runtime/oat/utils/assembler.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_ASSEMBLER_H_
-#define ART_SRC_OAT_UTILS_ASSEMBLER_H_
+#ifndef ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_
+#define ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_
#include <vector>
@@ -456,4 +456,4 @@
} // namespace art
-#endif // ART_SRC_OAT_UTILS_ASSEMBLER_H_
+#endif // ART_RUNTIME_OAT_UTILS_ASSEMBLER_H_
diff --git a/runtime/oat/utils/managed_register.h b/runtime/oat/utils/managed_register.h
index a3d5795..4dd2acd 100644
--- a/runtime/oat/utils/managed_register.h
+++ b/runtime/oat/utils/managed_register.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_
-#define ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_
+#ifndef ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_
+#define ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_
namespace art {
@@ -69,4 +69,4 @@
} // namespace art
-#endif // ART_SRC_OAT_UTILS_MANAGED_REGISTER_H_
+#endif // ART_RUNTIME_OAT_UTILS_MANAGED_REGISTER_H_
diff --git a/runtime/oat/utils/mips/assembler_mips.h b/runtime/oat/utils/mips/assembler_mips.h
index 02759e4..eeb4a57 100644
--- a/runtime/oat/utils/mips/assembler_mips.h
+++ b/runtime/oat/utils/mips/assembler_mips.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
-#define ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
+#ifndef ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
+#define ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
#include <vector>
@@ -510,4 +510,4 @@
} // namespace mips
} // namespace art
-#endif // ART_SRC_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
+#endif // ART_RUNTIME_OAT_UTILS_MIPS_ASSEMBLER_MIPS_H_
diff --git a/runtime/oat/utils/mips/managed_register_mips.h b/runtime/oat/utils/mips/managed_register_mips.h
index aaaabfc..b335ff9 100644
--- a/runtime/oat/utils/mips/managed_register_mips.h
+++ b/runtime/oat/utils/mips/managed_register_mips.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
-#define ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
+#ifndef ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
+#define ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
#include "constants_mips.h"
#include "oat/utils/managed_register.h"
@@ -225,4 +225,4 @@
} // namespace art
-#endif // ART_SRC_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
+#endif // ART_RUNTIME_OAT_UTILS_MIPS_MANAGED_REGISTER_MIPS_H_
diff --git a/runtime/oat/utils/x86/assembler_x86.h b/runtime/oat/utils/x86/assembler_x86.h
index dddb9b1..390f7aa 100644
--- a/runtime/oat/utils/x86/assembler_x86.h
+++ b/runtime/oat/utils/x86/assembler_x86.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_
-#define ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_
+#ifndef ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_
+#define ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_
#include <vector>
#include "base/macros.h"
@@ -652,4 +652,4 @@
} // namespace x86
} // namespace art
-#endif // ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_
+#endif // ART_RUNTIME_OAT_UTILS_X86_ASSEMBLER_X86_H_
diff --git a/runtime/oat/utils/x86/managed_register_x86.h b/runtime/oat/utils/x86/managed_register_x86.h
index 4481456..b564a83 100644
--- a/runtime/oat/utils/x86/managed_register_x86.h
+++ b/runtime/oat/utils/x86/managed_register_x86.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_
-#define ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_
+#ifndef ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_
+#define ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_
#include "constants_x86.h"
#include "oat/utils/managed_register.h"
@@ -215,4 +215,4 @@
} // namespace art
-#endif // ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_
+#endif // ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_