Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h
index 78d4614..23d6b9f 100644
--- a/compiler/dex/arena_allocator.h
+++ b/compiler/dex/arena_allocator.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
+#ifndef ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
+#define ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
#include <stdint.h>
#include <stddef.h>
@@ -93,4 +93,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_COMPILER_ARENA_ALLOCATOR_H_
+#endif // ART_COMPILER_DEX_ARENA_ALLOCATOR_H_
diff --git a/compiler/dex/arena_bit_vector.h b/compiler/dex/arena_bit_vector.h
index a950e82..0b7bbc5 100644
--- a/compiler/dex/arena_bit_vector.h
+++ b/compiler/dex/arena_bit_vector.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
+#ifndef ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
+#define ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
#include <stdint.h>
#include <stddef.h>
@@ -124,4 +124,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_COMPILER_ARENA_BIT_VECTOR_H_
+#endif // ART_COMPILER_DEX_ARENA_BIT_VECTOR_H_
diff --git a/compiler/dex/backend.h b/compiler/dex/backend.h
index 45a1531..6f5ba38 100644
--- a/compiler/dex/backend.h
+++ b/compiler/dex/backend.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_BACKEND_H_
-#define ART_SRC_COMPILER_DEX_BACKEND_H_
+#ifndef ART_COMPILER_DEX_BACKEND_H_
+#define ART_COMPILER_DEX_BACKEND_H_
#include "compiled_method.h"
#include "arena_allocator.h"
@@ -37,4 +37,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_BACKEND_H_
+#endif // ART_COMPILER_DEX_BACKEND_H_
diff --git a/compiler/dex/compiler_enums.h b/compiler/dex/compiler_enums.h
index bc456b2..88240e8 100644
--- a/compiler/dex/compiler_enums.h
+++ b/compiler/dex/compiler_enums.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
-#define ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
+#ifndef ART_COMPILER_DEX_COMPILER_ENUMS_H_
+#define ART_COMPILER_DEX_COMPILER_ENUMS_H_
#include "dex_instruction.h"
@@ -414,4 +414,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_COMPILERENUMS_H_
+#endif // ART_COMPILER_DEX_COMPILER_ENUMS_H_
diff --git a/compiler/dex/compiler_internals.h b/compiler/dex/compiler_internals.h
index a3fa25e..9dd0272 100644
--- a/compiler/dex/compiler_internals.h
+++ b/compiler/dex/compiler_internals.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
+#ifndef ART_COMPILER_DEX_COMPILER_INTERNALS_H_
+#define ART_COMPILER_DEX_COMPILER_INTERNALS_H_
#include <assert.h>
#include <stdbool.h>
@@ -33,4 +33,4 @@
#include "thread.h"
#include "utils.h"
-#endif // ART_SRC_COMPILER_DEX_COMPILER_INTERNAL_H_
+#endif // ART_COMPILER_DEX_COMPILER_INTERNALS_H_
diff --git a/compiler/dex/compiler_ir.h b/compiler/dex/compiler_ir.h
index c6f99f3..a9b5bf6 100644
--- a/compiler/dex/compiler_ir.h
+++ b/compiler/dex/compiler_ir.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_IR_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_IR_H_
+#ifndef ART_COMPILER_DEX_COMPILER_IR_H_
+#define ART_COMPILER_DEX_COMPILER_IR_H_
#include <vector>
#include <llvm/IR/Module.h>
@@ -112,4 +112,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_COMPILER_IR_H_
+#endif // ART_COMPILER_DEX_COMPILER_IR_H_
diff --git a/compiler/dex/dataflow_iterator-inl.h b/compiler/dex/dataflow_iterator-inl.h
index b20004d..06cc505 100644
--- a/compiler/dex/dataflow_iterator-inl.h
+++ b/compiler/dex/dataflow_iterator-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
-#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
#include "dataflow_iterator.h"
@@ -65,4 +65,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
+#endif // ART_COMPILER_DEX_DATAFLOW_ITERATOR_INL_H_
diff --git a/compiler/dex/dataflow_iterator.h b/compiler/dex/dataflow_iterator.h
index 12cbf9c..4c112f9 100644
--- a/compiler/dex/dataflow_iterator.h
+++ b/compiler/dex/dataflow_iterator.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
-#define ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#ifndef ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#define ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
#include "compiler_ir.h"
#include "mir_graph.h"
@@ -155,4 +155,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_DATAFLOW_ITERATOR_H_
+#endif // ART_COMPILER_DEX_DATAFLOW_ITERATOR_H_
diff --git a/compiler/dex/frontend.h b/compiler/dex/frontend.h
index 69d7f77..a863389 100644
--- a/compiler/dex/frontend.h
+++ b/compiler/dex/frontend.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_COMPILER_H_
-#define ART_SRC_COMPILER_DEX_COMPILER_H_
+#ifndef ART_COMPILER_DEX_FRONTEND_H_
+#define ART_COMPILER_DEX_FRONTEND_H_
#include "dex_file.h"
#include "dex_instruction.h"
@@ -123,4 +123,4 @@
-#endif // ART_SRC_COMPILER_DEX_COMPILER_H_
+#endif // ART_COMPILER_DEX_FRONTEND_H_
diff --git a/compiler/dex/growable_array.h b/compiler/dex/growable_array.h
index c4684a7..6ab0f16 100644
--- a/compiler/dex/growable_array.h
+++ b/compiler/dex/growable_array.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
-#define ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
+#ifndef ART_COMPILER_DEX_GROWABLE_ARRAY_H_
+#define ART_COMPILER_DEX_GROWABLE_ARRAY_H_
#include <stdint.h>
#include <stddef.h>
@@ -168,4 +168,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_GROWABLE_LIST_H_
+#endif // ART_COMPILER_DEX_GROWABLE_ARRAY_H_
diff --git a/compiler/dex/local_value_numbering.h b/compiler/dex/local_value_numbering.h
index beb4cea..f2b2291 100644
--- a/compiler/dex/local_value_numbering.h
+++ b/compiler/dex/local_value_numbering.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
-#define ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#ifndef ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#define ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
#include "compiler_internals.h"
@@ -140,4 +140,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
+#endif // ART_COMPILER_DEX_LOCAL_VALUE_NUMBERING_H_
diff --git a/compiler/dex/mir_graph.h b/compiler/dex/mir_graph.h
index 2b1c21f..a40fa97 100644
--- a/compiler/dex/mir_graph.h
+++ b/compiler/dex/mir_graph.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_MIRGRAPH_H_
-#define ART_SRC_COMPILER_DEX_MIRGRAPH_H_
+#ifndef ART_COMPILER_DEX_MIR_GRAPH_H_
+#define ART_COMPILER_DEX_MIR_GRAPH_H_
#include "dex_file.h"
#include "dex_instruction.h"
@@ -667,4 +667,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_MIRGRAPH_H_
+#endif // ART_COMPILER_DEX_MIR_GRAPH_H_
diff --git a/compiler/dex/portable/mir_to_gbc.h b/compiler/dex/portable/mir_to_gbc.h
index 8aa0271..2786314 100644
--- a/compiler/dex/portable/mir_to_gbc.h
+++ b/compiler/dex/portable/mir_to_gbc.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
-#define ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
+#ifndef ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
+#define ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
#include "invoke_type.h"
#include "compiled_method.h"
@@ -192,4 +192,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_PORTABLE_MIRTOGBC_H_
+#endif // ART_COMPILER_DEX_PORTABLE_MIR_TO_GBC_H_
diff --git a/compiler/dex/quick/arm/arm_lir.h b/compiler/dex/quick/arm/arm_lir.h
index 9dd7daf..fca17a1 100644
--- a/compiler/dex/quick/arm/arm_lir.h
+++ b/compiler/dex/quick/arm/arm_lir.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
+#define ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
#include "dex/compiler_internals.h"
@@ -496,4 +496,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_ARM_ARMLIR_H_
+#endif // ART_COMPILER_DEX_QUICK_ARM_ARM_LIR_H_
diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h
index a9199df..1599941 100644
--- a/compiler/dex/quick/arm/codegen_arm.h
+++ b/compiler/dex/quick/arm/codegen_arm.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
-#define ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
+#ifndef ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
+#define ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
#include "dex/compiler_internals.h"
@@ -192,4 +192,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_ARM_CODEGENARM_H_
+#endif // ART_COMPILER_DEX_QUICK_ARM_CODEGEN_ARM_H_
diff --git a/compiler/dex/quick/mips/codegen_mips.h b/compiler/dex/quick/mips/codegen_mips.h
index 9723b899..376ad7f 100644
--- a/compiler/dex/quick/mips/codegen_mips.h
+++ b/compiler/dex/quick/mips/codegen_mips.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
-#define ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
+#define ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
#include "dex/compiler_internals.h"
#include "mips_lir.h"
@@ -180,4 +180,4 @@
} // namespace art
-#endif // ART_SRC_DEX_QUICK_CODEGEN_MIPS_CODEGENMIPS_H_
+#endif // ART_COMPILER_DEX_QUICK_MIPS_CODEGEN_MIPS_H_
diff --git a/compiler/dex/quick/mips/mips_lir.h b/compiler/dex/quick/mips/mips_lir.h
index ceab9ab..8a99e93 100644
--- a/compiler/dex/quick/mips/mips_lir.h
+++ b/compiler/dex/quick/mips/mips_lir.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
+#define ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
#include "dex/compiler_internals.h"
@@ -429,4 +429,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_MIPS_MIPSLIR_H_
+#endif // ART_COMPILER_DEX_QUICK_MIPS_MIPS_LIR_H_
diff --git a/compiler/dex/quick/mir_to_lir-inl.h b/compiler/dex/quick/mir_to_lir-inl.h
index 4eef264..d9aef5d 100644
--- a/compiler/dex/quick/mir_to_lir-inl.h
+++ b/compiler/dex/quick/mir_to_lir-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
#include "mir_to_lir.h"
@@ -198,4 +198,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
+#endif // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_INL_H_
diff --git a/compiler/dex/quick/mir_to_lir.h b/compiler/dex/quick/mir_to_lir.h
index 47514f7..bec86c1 100644
--- a/compiler/dex/quick/mir_to_lir.h
+++ b/compiler/dex/quick/mir_to_lir.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#define ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
#include "invoke_type.h"
#include "compiled_method.h"
@@ -776,4 +776,4 @@
} // namespace art
-#endif //ART_SRC_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
+#endif // ART_COMPILER_DEX_QUICK_MIR_TO_LIR_H_
diff --git a/compiler/dex/quick/x86/codegen_x86.h b/compiler/dex/quick/x86/codegen_x86.h
index 3e30141..4fa9dfb 100644
--- a/compiler/dex/quick/x86/codegen_x86.h
+++ b/compiler/dex/quick/x86/codegen_x86.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
-#define ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
+#ifndef ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
+#define ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
#include "dex/compiler_internals.h"
#include "x86_lir.h"
@@ -202,4 +202,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_X86_CODEGENX86_H_
+#endif // ART_COMPILER_DEX_QUICK_X86_CODEGEN_X86_H_
diff --git a/compiler/dex/quick/x86/x86_lir.h b/compiler/dex/quick/x86/x86_lir.h
index 600bd03..a39231b 100644
--- a/compiler/dex/quick/x86/x86_lir.h
+++ b/compiler/dex/quick/x86/x86_lir.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
-#define ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
+#ifndef ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_
+#define ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_
#include "dex/compiler_internals.h"
@@ -439,4 +439,4 @@
} // namespace art
-#endif // ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_
+#endif // ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_