diff options
author | Brian Carlstrom <bdc@google.com> | 2013-07-17 14:40:12 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2013-07-17 16:49:05 -0700 |
commit | fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d (patch) | |
tree | 5fc7f5b941724a62f8e3411df09fae431ff5e3cf | |
parent | 56d947fbc9bc2992e2f93112fafb73e50d2aaa7a (diff) | |
download | android_art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.gz android_art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.bz2 android_art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.zip |
Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
234 files changed, 726 insertions, 691 deletions
diff --git a/Android.mk b/Android.mk index 4ffa9ac0ab..5a28723e8e 100644 --- a/Android.mk +++ b/Android.mk @@ -78,8 +78,11 @@ clean-oat-target: adb shell rm system/app/*.odex adb shell rm data/run-test/test-*/dalvik-cache/*@classes.dex +######################################################################## +# darwin build + # we aren't building most of art on darwin right now, but we do need to build new dalvikvm -ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86) +ifeq ($(HOST_OS),darwin) art_dont_bother := true include $(art_path)/dalvikvm/Android.mk endif @@ -325,14 +328,21 @@ dump-oat-Calculator: $(TARGET_OUT_APPS)/Calculator.odex $(TARGET_BOOT_IMG_OUT) $ endif ######################################################################## -# cpplint target +# cpplint targets to style check art source files -# "mm cpplint-art" to style check art source files +# "mm cpplint-art" to verify we aren't regressing .PHONY: cpplint-art cpplint-art: ./art/tools/cpplint.py \ - --filter=-whitespace/comments,-whitespace/line_length,-build/include,-build/header_guard,-readability/function,-readability/streams,-readability/todo,-runtime/references \ - $(ANDROID_BUILD_TOP)/art/src/*.h $(ANDROID_BUILD_TOP)/art/src/*.cc + --filter=-,+build/header_guard, \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) + +# "mm cpplint-art-aspirational" to see warnings we would like to fix +.PHONY: cpplint-art-aspirational +cpplint-art-aspirational: + ./art/tools/cpplint.py \ + --filter=-whitespace/comments,-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references \ + $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION)) ######################################################################## # targets to switch back and forth from libdvm to libart diff --git a/compiler/dex/arena_allocator.h b/compiler/dex/arena_allocator.h index 78d4614f90..23d6b9f06b 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 @@ struct MemStats { } // 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 a950e82498..0b7bbc5f16 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 @@ class ArenaBitVector { } // 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 45a1531b85..6f5ba388e1 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 @@ class Backend { } // 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 bc456b2e70..88240e8c40 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 @@ std::ostream& operator<<(std::ostream& os, const OatBitMapKind& kind); } // 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 a3fa25e842..9dd0272e50 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 c6f99f3a88..a9b5bf68fc 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 @@ struct CompilationUnit { } // 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 b20004decc..06cc505a9a 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 @@ inline BasicBlock* AllNodesIterator::NextBody(bool had_change) { } // 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 12cbf9cadf..4c112f9678 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 { } // 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 69d7f7728c..a86338950c 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 @@ extern "C" art::CompiledMethod* ArtCompileMethod(art::CompilerDriver& driver, -#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 c4684a71f6..6ab0f1630a 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 @@ class GrowableArray { } // 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 beb4cea733..f2b2291e56 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 @@ class LocalValueNumbering { } // 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 2b1c21fd70..a40fa97ad5 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 @@ class MIRGraph { } // 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 8aa0271761..278631466f 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 @@ class MirConverter : public Backend { } // 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 9dd7dafcd6..fca17a1640 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 @@ struct ArmEncodingMap { } // 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 a9199dfa7c..1599941ef6 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 @@ class ArmMir2Lir : public Mir2Lir { } // 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 9723b899a9..376ad7f10e 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 @@ class MipsMir2Lir : public Mir2Lir { } // 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 ceab9ab1e5..8a99e93f09 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 @@ extern MipsEncodingMap EncodingMap[kMipsLast]; } // 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 4eef264a0f..d9aef5d968 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 @@ inline void Mir2Lir::SetupResourceMasks(LIR* lir) { } // 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 47514f769f..bec86c181e 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 @@ class Mir2Lir : public Backend { } // 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 3e30141594..4fa9dfb4d9 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 @@ class X86Mir2Lir : public Mir2Lir { } // 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 600bd03026..a39231b75a 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 @@ extern X86ConditionCode X86ConditionEncoding(ConditionCode cond); } // namespace art -#endif // ART_SRC_COMPILER_DEX_QUICK_X86_X86LIR_H_ +#endif // ART_COMPILER_DEX_QUICK_X86_X86_LIR_H_ diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 4d7f0cf7b6..80cc89b95f 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ -#define ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#ifndef ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#define ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ #include <set> #include <string> @@ -410,4 +410,4 @@ class CompilerDriver { } // namespace art -#endif // ART_SRC_COMPILER_DRIVER_COMPILER_DRIVER_H_ +#endif // ART_COMPILER_DRIVER_COMPILER_DRIVER_H_ diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h index 3c6129d642..53efd12ba7 100644 --- a/compiler/driver/dex_compilation_unit.h +++ b/compiler/driver/dex_compilation_unit.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ -#define ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ +#ifndef ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ +#define ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ #include <stdint.h> @@ -113,4 +113,4 @@ class DexCompilationUnit { } // namespace art -#endif // ART_SRC_COMPILER_DEX_DEX_COMPILATION_UNIT_H_ +#endif // ART_COMPILER_DRIVER_DEX_COMPILATION_UNIT_H_ diff --git a/compiler/elf_fixup.h b/compiler/elf_fixup.h index 79c45c1874..1abf06b1c5 100644 --- a/compiler/elf_fixup.h +++ b/compiler/elf_fixup.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_FIXUP_H_ -#define ART_SRC_ELF_FIXUP_H_ +#ifndef ART_COMPILER_ELF_FIXUP_H_ +#define ART_COMPILER_ELF_FIXUP_H_ #include <stdint.h> @@ -53,4 +53,4 @@ class ElfFixup { } // namespace art -#endif // ART_SRC_ELF_FIXUP_H_ +#endif // ART_COMPILER_ELF_FIXUP_H_ diff --git a/compiler/elf_stripper.h b/compiler/elf_stripper.h index b202e6e1f0..6015b30cb2 100644 --- a/compiler/elf_stripper.h +++ b/compiler/elf_stripper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_STRIPPER_H_ -#define ART_SRC_ELF_STRIPPER_H_ +#ifndef ART_COMPILER_ELF_STRIPPER_H_ +#define ART_COMPILER_ELF_STRIPPER_H_ #include "base/macros.h" #include "os.h" @@ -34,4 +34,4 @@ class ElfStripper { } // namespace art -#endif // ART_SRC_ELF_STRIPPER_H_ +#endif // ART_COMPILER_ELF_STRIPPER_H_ diff --git a/compiler/elf_writer.h b/compiler/elf_writer.h index 7392e67d7f..ab436e4fb3 100644 --- a/compiler/elf_writer.h +++ b/compiler/elf_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_H_ -#define ART_SRC_ELF_WRITER_H_ +#ifndef ART_COMPILER_ELF_WRITER_H_ +#define ART_COMPILER_ELF_WRITER_H_ #include <stdint.h> @@ -62,4 +62,4 @@ class ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_H_ +#endif // ART_COMPILER_ELF_WRITER_H_ diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h index 21f23e113d..468fa9a84f 100644 --- a/compiler/elf_writer_mclinker.h +++ b/compiler/elf_writer_mclinker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_ -#define ART_SRC_ELF_WRITER_MCLINKER_H_ +#ifndef ART_COMPILER_ELF_WRITER_MCLINKER_H_ +#define ART_COMPILER_ELF_WRITER_MCLINKER_H_ #include "elf_writer.h" @@ -96,4 +96,4 @@ class ElfWriterMclinker : public ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_MCLINKER_H_ +#endif // ART_COMPILER_ELF_WRITER_MCLINKER_H_ diff --git a/compiler/elf_writer_quick.h b/compiler/elf_writer_quick.h index a1a386b3d7..a15c239de9 100644 --- a/compiler/elf_writer_quick.h +++ b/compiler/elf_writer_quick.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_WRITER_MCLINKER_H_ -#define ART_SRC_ELF_WRITER_MCLINKER_H_ +#ifndef ART_COMPILER_ELF_WRITER_QUICK_H_ +#define ART_COMPILER_ELF_WRITER_QUICK_H_ #include "elf_writer.h" @@ -48,4 +48,4 @@ class ElfWriterQuick : public ElfWriter { } // namespace art -#endif // ART_SRC_ELF_WRITER_MCLINKER_H_ +#endif // ART_COMPILER_ELF_WRITER_QUICK_H_ diff --git a/compiler/image_writer.h b/compiler/image_writer.h index 9b0d671604..e43ec6338f 100644 --- a/compiler/image_writer.h +++ b/compiler/image_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_IMAGE_WRITER_H_ -#define ART_SRC_IMAGE_WRITER_H_ +#ifndef ART_COMPILER_IMAGE_WRITER_H_ +#define ART_COMPILER_IMAGE_WRITER_H_ #include <stdint.h> @@ -207,4 +207,4 @@ class ImageWriter { } // namespace art -#endif // ART_SRC_IMAGE_WRITER_H_ +#endif // ART_COMPILER_IMAGE_WRITER_H_ diff --git a/compiler/jni/portable/jni_compiler.h b/compiler/jni/portable/jni_compiler.h index a04277c9e6..9bdf35ef10 100644 --- a/compiler/jni/portable/jni_compiler.h +++ b/compiler/jni/portable/jni_compiler.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ -#define ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#ifndef ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#define ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ #include <stdint.h> @@ -84,4 +84,4 @@ class JniCompiler { } // namespace art -#endif // ART_SRC_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ +#endif // ART_COMPILER_JNI_PORTABLE_JNI_COMPILER_H_ diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h index 3787d45c6f..f188700746 100644 --- a/compiler/jni/quick/arm/calling_convention_arm.h +++ b/compiler/jni/quick/arm/calling_convention_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ -#define ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ +#ifndef ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ +#define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ #include "jni/quick/calling_convention.h" @@ -85,4 +85,4 @@ class ArmJniCallingConvention : public JniCallingConvention { } // namespace arm } // namespace art -#endif // ART_SRC_OAT_JNI_ARM_CALLING_CONVENTION_ARM_H_ +#endif // ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h index 121d1f80ae..d492b42237 100644 --- a/compiler/jni/quick/calling_convention.h +++ b/compiler/jni/quick/calling_convention.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ -#define ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ +#ifndef ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ +#define ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ #include <vector> #include "oat/utils/managed_register.h" @@ -286,4 +286,4 @@ class JniCallingConvention : public CallingConvention { } // namespace art -#endif // ART_SRC_OAT_JNI_CALLING_CONVENTION_H_ +#endif // ART_COMPILER_JNI_QUICK_CALLING_CONVENTION_H_ diff --git a/compiler/jni/quick/mips/calling_convention_mips.h b/compiler/jni/quick/mips/calling_convention_mips.h index 90681362bc..8412898dd8 100644 --- a/compiler/jni/quick/mips/calling_convention_mips.h +++ b/compiler/jni/quick/mips/calling_convention_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ -#define ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ +#ifndef ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ +#define ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ #include "jni/quick/calling_convention.h" @@ -83,4 +83,4 @@ class MipsJniCallingConvention : public JniCallingConvention { } // namespace mips } // namespace art -#endif // ART_SRC_OAT_JNI_MIPS_CALLING_CONVENTION_MIPS_H_ +#endif // ART_COMPILER_JNI_QUICK_MIPS_CALLING_CONVENTION_MIPS_H_ diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h index ea8a26e7d5..082c1c8eb1 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.h +++ b/compiler/jni/quick/x86/calling_convention_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ -#define ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ +#ifndef ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ +#define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ #include "jni/quick/calling_convention.h" @@ -80,4 +80,4 @@ class X86JniCallingConvention : public JniCallingConvention { } // namespace x86 } // namespace art -#endif // ART_SRC_OAT_JNI_X86_CALLING_CONVENTION_X86_H_ +#endif // ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ diff --git a/compiler/llvm/backend_options.h b/compiler/llvm/backend_options.h index 924a34639c..2a08bda2f1 100644 --- a/compiler/llvm/backend_options.h +++ b/compiler/llvm/backend_options.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ -#define ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#ifndef ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#define ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ #include <llvm/Support/CommandLine.h> @@ -47,4 +47,4 @@ inline void InitialBackendOptions() { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_BACKEND_OPTIONS_H_ +#endif // ART_COMPILER_LLVM_BACKEND_OPTIONS_H_ diff --git a/compiler/llvm/backend_types.h b/compiler/llvm/backend_types.h index c89504a859..095040e5eb 100644 --- a/compiler/llvm/backend_types.h +++ b/compiler/llvm/backend_types.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ -#define ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ +#ifndef ART_COMPILER_LLVM_BACKEND_TYPES_H_ +#define ART_COMPILER_LLVM_BACKEND_TYPES_H_ #include "base/logging.h" @@ -101,4 +101,4 @@ inline JType GetJTypeFromShorty(char shorty_jty) { } // namespace art -#endif // ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_ +#endif // ART_COMPILER_LLVM_BACKEND_TYPES_H_ diff --git a/compiler/llvm/compiler_llvm.h b/compiler/llvm/compiler_llvm.h index b70ddc5e20..77841d8564 100644 --- a/compiler/llvm/compiler_llvm.h +++ b/compiler/llvm/compiler_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ -#define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ +#ifndef ART_COMPILER_LLVM_COMPILER_LLVM_H_ +#define ART_COMPILER_LLVM_COMPILER_LLVM_H_ #include "base/macros.h" #include "dex_file.h" @@ -100,4 +100,4 @@ class CompilerLLVM { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ +#endif // ART_COMPILER_LLVM_COMPILER_LLVM_H_ diff --git a/compiler/llvm/intrinsic_helper.h b/compiler/llvm/intrinsic_helper.h index 49b8a95230..bb123fd575 100644 --- a/compiler/llvm/intrinsic_helper.h +++ b/compiler/llvm/intrinsic_helper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ -#define ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ +#ifndef ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ +#define ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ #include "base/logging.h" @@ -154,4 +154,4 @@ class IntrinsicHelper { } // namespace llvm } // namespace art -#endif // ART_SRC_GREENLAND_INTRINSIC_HELPER_H_ +#endif // ART_COMPILER_LLVM_INTRINSIC_HELPER_H_ diff --git a/compiler/llvm/ir_builder.h b/compiler/llvm/ir_builder.h index 734b22f791..65da005e9b 100644 --- a/compiler/llvm/ir_builder.h +++ b/compiler/llvm/ir_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_IR_BUILDER_H_ +#define ART_COMPILER_LLVM_IR_BUILDER_H_ #include "backend_types.h" #include "dex/compiler_enums.h" @@ -487,4 +487,4 @@ class IRBuilder : public LLVMIRBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_IR_BUILDER_H_ +#endif // ART_COMPILER_LLVM_IR_BUILDER_H_ diff --git a/compiler/llvm/llvm_compilation_unit.h b/compiler/llvm/llvm_compilation_unit.h index a4f0adbab8..9de132379b 100644 --- a/compiler/llvm/llvm_compilation_unit.h +++ b/compiler/llvm/llvm_compilation_unit.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ -#define ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#ifndef ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#define ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ #include "base/logging.h" #include "base/mutex.h" @@ -135,4 +135,4 @@ class LlvmCompilationUnit { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ +#endif // ART_COMPILER_LLVM_LLVM_COMPILATION_UNIT_H_ diff --git a/compiler/llvm/md_builder.h b/compiler/llvm/md_builder.h index 79a7caa04c..cc169a3219 100644 --- a/compiler/llvm/md_builder.h +++ b/compiler/llvm/md_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_MD_BUILDER_H_ +#define ART_COMPILER_LLVM_MD_BUILDER_H_ #include "backend_types.h" @@ -68,4 +68,4 @@ class MDBuilder : public LLVMMDBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_MD_BUILDER_H_ +#endif // ART_COMPILER_LLVM_MD_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder.h b/compiler/llvm/runtime_support_builder.h index 267b406232..c3c0856bd0 100644 --- a/compiler/llvm/runtime_support_builder.h +++ b/compiler/llvm/runtime_support_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ #include "backend_types.h" #include "base/logging.h" @@ -95,4 +95,4 @@ class RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_ diff --git a/compiler/llvm/runtime_support_builder_arm.h b/compiler/llvm/runtime_support_builder_arm.h index 3c5972fc33..6aa23b2306 100644 --- a/compiler/llvm/runtime_support_builder_arm.h +++ b/compiler/llvm/runtime_support_builder_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ #include "runtime_support_builder.h" @@ -43,4 +43,4 @@ class RuntimeSupportBuilderARM : public RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_ARM_H_ diff --git a/compiler/llvm/runtime_support_builder_thumb2.h b/compiler/llvm/runtime_support_builder_thumb2.h index 4762a269f9..941bd6b2bb 100644 --- a/compiler/llvm/runtime_support_builder_thumb2.h +++ b/compiler/llvm/runtime_support_builder_thumb2.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ #include "runtime_support_builder_arm.h" @@ -34,4 +34,4 @@ class RuntimeSupportBuilderThumb2 : public RuntimeSupportBuilderARM { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_THUMB2_H_ diff --git a/compiler/llvm/runtime_support_builder_x86.h b/compiler/llvm/runtime_support_builder_x86.h index e5fdbc2e26..831d022ce5 100644 --- a/compiler/llvm/runtime_support_builder_x86.h +++ b/compiler/llvm/runtime_support_builder_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ #include "runtime_support_builder.h" @@ -39,4 +39,4 @@ class RuntimeSupportBuilderX86 : public RuntimeSupportBuilder { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_X86_H_ diff --git a/compiler/llvm/runtime_support_llvm_func.h b/compiler/llvm/runtime_support_llvm_func.h index ac6f3b869f..c0e76addc6 100644 --- a/compiler/llvm/runtime_support_llvm_func.h +++ b/compiler/llvm/runtime_support_llvm_func.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ +#ifndef ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ +#define ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ namespace art { namespace llvm { @@ -35,4 +35,4 @@ namespace runtime_support { } // namespace llvm } // namespace art -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_FUNC_H_ +#endif // ART_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_FUNC_H_ diff --git a/compiler/llvm/utils_llvm.h b/compiler/llvm/utils_llvm.h index 2e273f4fe9..a606b91958 100644 --- a/compiler/llvm/utils_llvm.h +++ b/compiler/llvm/utils_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTILS_LLVM_H_ -#define ART_SRC_UTILS_LLVM_H_ +#ifndef ART_COMPILER_LLVM_UTILS_LLVM_H_ +#define ART_COMPILER_LLVM_UTILS_LLVM_H_ #include <llvm/Analysis/Verifier.h> @@ -29,4 +29,4 @@ namespace art { } // namespace art -#endif // ART_SRC_UTILS_LLVM_H_ +#endif // ART_COMPILER_LLVM_UTILS_LLVM_H_ diff --git a/compiler/oat_writer.h b/compiler/oat_writer.h index 1f97bf853c..ea7156ea49 100644 --- a/compiler/oat_writer.h +++ b/compiler/oat_writer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_WRITER_H_ -#define ART_SRC_OAT_WRITER_H_ +#ifndef ART_COMPILER_OAT_WRITER_H_ +#define ART_COMPILER_OAT_WRITER_H_ #include <stdint.h> @@ -224,4 +224,4 @@ class OatWriter { } // namespace art -#endif // ART_SRC_OAT_WRITER_H_ +#endif // ART_COMPILER_OAT_WRITER_H_ diff --git a/compiler/sea_ir/instruction_tools.h b/compiler/sea_ir/instruction_tools.h index f68cdd0784..b0bbc272c8 100644 --- a/compiler/sea_ir/instruction_tools.h +++ b/compiler/sea_ir/instruction_tools.h @@ -17,8 +17,8 @@ #include "dex_instruction.h" -#ifndef INSTRUCTION_TOOLS_H_ -#define INSTRUCTION_TOOLS_H_ +#ifndef ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ +#define ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ // Note: This file has content cannibalized for SEA_IR from the MIR implementation, // to avoid having a dependence on MIR. @@ -121,4 +121,4 @@ class InstructionTools { static const int instruction_attributes_[]; }; } // end namespace sea_ir -#endif // INSTRUCTION_TOOLS_H_ +#endif // ART_COMPILER_SEA_IR_INSTRUCTION_TOOLS_H_ diff --git a/compiler/sea_ir/sea.h b/compiler/sea_ir/sea.h index f2c71469e5..ce4624d438 100644 --- a/compiler/sea_ir/sea.h +++ b/compiler/sea_ir/sea.h @@ -15,8 +15,8 @@ */ -#ifndef SEA_IR_H_ -#define SEA_IR_H_ +#ifndef ART_COMPILER_SEA_IR_SEA_H_ +#define ART_COMPILER_SEA_IR_SEA_H_ #include <set> #include <map> @@ -159,4 +159,4 @@ class SeaGraph { } // end namespace sea_ir -#endif +#endif // ART_COMPILER_SEA_IR_SEA_H_ diff --git a/compiler/stubs/stubs.h b/compiler/stubs/stubs.h index ebe761df35..d85eae8e1e 100644 --- a/compiler/stubs/stubs.h +++ b/compiler/stubs/stubs.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_STUBS_STUBS_H_ -#define ART_SRC_COMPILER_STUBS_STUBS_H_ +#ifndef ART_COMPILER_STUBS_STUBS_H_ +#define ART_COMPILER_STUBS_STUBS_H_ #include "runtime.h" @@ -56,4 +56,4 @@ const std::vector<uint8_t>* CreateInterpreterToQuickEntry() } // namespace art -#endif // ART_SRC_COMPILER_STUBS_STUBS_H_ +#endif // ART_COMPILER_STUBS_STUBS_H_ diff --git a/jdwpspy/Common.h b/jdwpspy/Common.h index 0bd305643a..33f1a670ea 100644 --- a/jdwpspy/Common.h +++ b/jdwpspy/Common.h @@ -3,8 +3,8 @@ * * jdwpspy common stuff. */ -#ifndef _JDWPSPY_COMMON -#define _JDWPSPY_COMMON +#ifndef ART_JDWPSPY_COMMON_H_ +#define ART_JDWPSPY_COMMON_H_ #include <stdint.h> #include <stdio.h> @@ -99,4 +99,4 @@ void printHexDump2(const void* vaddr, size_t length, const char* prefix); void printHexDumpEx(FILE* fp, const void* vaddr, size_t length, HexDumpMode mode, const char* prefix); -#endif /*_JDWPSPY_COMMON*/ +#endif // ART_JDWPSPY_COMMON_H_ diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 8ea4adfcf2..7b20c7aee0 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ASM_SUPPORT_H_ -#define ART_SRC_ASM_SUPPORT_H_ +#ifndef ART_RUNTIME_ASM_SUPPORT_H_ +#define ART_RUNTIME_ASM_SUPPORT_H_ // Value loaded into rSUSPEND for quick. When this value is counted down to zero we do a suspend // check. @@ -55,4 +55,4 @@ #define THREAD_EXCEPTION_OFFSET 12 #endif -#endif // ART_SRC_ASM_SUPPORT_H_ +#endif // ART_RUNTIME_ASM_SUPPORT_H_ diff --git a/runtime/atomic.h b/runtime/atomic.h index d340dc5474..cb6f86b921 100644 --- a/runtime/atomic.h +++ b/runtime/atomic.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ATOMIC_H_ -#define ART_SRC_ATOMIC_H_ +#ifndef ART_RUNTIME_ATOMIC_H_ +#define ART_RUNTIME_ATOMIC_H_ #include <stdint.h> @@ -54,4 +54,4 @@ class QuasiAtomic { } // namespace art -#endif // ART_SRC_ATOMIC_H_ +#endif // ART_RUNTIME_ATOMIC_H_ diff --git a/runtime/atomic_integer.h b/runtime/atomic_integer.h index c4a8de9817..57836d6e26 100644 --- a/runtime/atomic_integer.h +++ b/runtime/atomic_integer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ATOMIC_INTEGER_H_ -#define ART_SRC_ATOMIC_INTEGER_H_ +#ifndef ART_RUNTIME_ATOMIC_INTEGER_H_ +#define ART_RUNTIME_ATOMIC_INTEGER_H_ #include "cutils/atomic.h" #include "cutils/atomic-inline.h" @@ -76,4 +76,4 @@ class AtomicInteger { } -#endif // ART_SRC_ATOMIC_INTEGER_H_ +#endif // ART_RUNTIME_ATOMIC_INTEGER_H_ diff --git a/runtime/barrier.h b/runtime/barrier.h index 2b0429a7c2..e0ad239eab 100644 --- a/runtime/barrier.h +++ b/runtime/barrier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BARRIER_H_ -#define ART_SRC_BARRIER_H_ +#ifndef ART_RUNTIME_BARRIER_H_ +#define ART_RUNTIME_BARRIER_H_ #include "base/mutex.h" #include "locks.h" @@ -52,4 +52,4 @@ class Barrier { }; } // namespace art -#endif // ART_SRC_GC_BARRIER_H_ +#endif // ART_RUNTIME_BARRIER_H_ diff --git a/runtime/base/casts.h b/runtime/base/casts.h index 34c05af4e3..be94c2eb78 100644 --- a/runtime/base/casts.h +++ b/runtime/base/casts.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_CASTS_H_ -#define ART_SRC_BASE_CASTS_H_ +#ifndef ART_RUNTIME_BASE_CASTS_H_ +#define ART_RUNTIME_BASE_CASTS_H_ #include <assert.h> #include <string.h> @@ -90,4 +90,4 @@ inline Dest bit_cast(const Source& source) { } // namespace art -#endif // ART_SRC_BASE_CASTS_H_ +#endif // ART_RUNTIME_BASE_CASTS_H_ diff --git a/runtime/base/histogram-inl.h b/runtime/base/histogram-inl.h index 9514209c11..bbca60308a 100644 --- a/runtime/base/histogram-inl.h +++ b/runtime/base/histogram-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef SRC_BASE_HISTOGRAM_INL_H_ -#define SRC_BASE_HISTOGRAM_INL_H_ +#ifndef ART_RUNTIME_BASE_HISTOGRAM_INL_H_ +#define ART_RUNTIME_BASE_HISTOGRAM_INL_H_ #include "histogram.h" @@ -251,5 +251,5 @@ inline double Histogram<Value>::Percentile(double per) const { } } // namespace art -#endif // SRC_BASE_HISTOGRAM_INL_H_ +#endif // ART_RUNTIME_BASE_HISTOGRAM_INL_H_ diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h index 6878e71ccc..8724d2c582 100644 --- a/runtime/base/histogram.h +++ b/runtime/base/histogram.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef ART_SRC_BASE_HISTOGRAM_H_ -#define ART_SRC_BASE_HISTOGRAM_H_ +#ifndef ART_RUNTIME_BASE_HISTOGRAM_H_ +#define ART_RUNTIME_BASE_HISTOGRAM_H_ #include <vector> #include <string> @@ -117,4 +117,4 @@ template <class Value> class Histogram { }; } -#endif // ART_SRC_BASE_HISTOGRAM_H_ +#endif // ART_RUNTIME_BASE_HISTOGRAM_H_ diff --git a/runtime/base/logging.h b/runtime/base/logging.h index 8d89e4d0cb..f02a39a1f9 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_LOGGING_H_ -#define ART_SRC_BASE_LOGGING_H_ +#ifndef ART_RUNTIME_BASE_LOGGING_H_ +#define ART_RUNTIME_BASE_LOGGING_H_ #include <cerrno> #include <cstring> @@ -334,4 +334,4 @@ extern const char* ProgramInvocationShortName(); } // namespace art -#endif // ART_SRC_BASE_LOGGING_H_ +#endif // ART_RUNTIME_BASE_LOGGING_H_ diff --git a/runtime/base/macros.h b/runtime/base/macros.h index 847105d20c..4a196f28e7 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MACROS_H_ -#define ART_SRC_BASE_MACROS_H_ +#ifndef ART_RUNTIME_BASE_MACROS_H_ +#define ART_RUNTIME_BASE_MACROS_H_ #include <stddef.h> // for size_t @@ -198,4 +198,4 @@ template<typename T> void UNUSED(const T&) {} #endif // defined(__SUPPORT_TS_ANNOTATION__) -#endif // ART_SRC_BASE_MACROS_H_ +#endif // ART_RUNTIME_BASE_MACROS_H_ diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h index f911054b86..07157da7aa 100644 --- a/runtime/base/mutex-inl.h +++ b/runtime/base/mutex-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MUTEX_INL_H_ -#define ART_SRC_BASE_MUTEX_INL_H_ +#ifndef ART_RUNTIME_BASE_MUTEX_INL_H_ +#define ART_RUNTIME_BASE_MUTEX_INL_H_ #include "mutex.h" @@ -184,4 +184,4 @@ inline void ReaderWriterMutex::SharedUnlock(Thread* self) { } // namespace art -#endif // ART_SRC_BASE_MUTEX_INL_H_ +#endif // ART_RUNTIME_BASE_MUTEX_INL_H_ diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index b62755917c..dea52a6615 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_MUTEX_H_ -#define ART_SRC_BASE_MUTEX_H_ +#ifndef ART_RUNTIME_BASE_MUTEX_H_ +#define ART_RUNTIME_BASE_MUTEX_H_ #include <pthread.h> #include <stdint.h> @@ -398,4 +398,4 @@ class SCOPED_LOCKABLE WriterMutexLock { } // namespace art -#endif // ART_SRC_BASE_MUTEX_H_ +#endif // ART_RUNTIME_BASE_MUTEX_H_ diff --git a/runtime/base/stl_util.h b/runtime/base/stl_util.h index eb8be42df3..ff9f40cbf8 100644 --- a/runtime/base/stl_util.h +++ b/runtime/base/stl_util.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_STL_UTIL_H_ -#define ART_SRC_BASE_STL_UTIL_H_ +#ifndef ART_RUNTIME_BASE_STL_UTIL_H_ +#define ART_RUNTIME_BASE_STL_UTIL_H_ #include <algorithm> #include <sstream> @@ -94,4 +94,4 @@ std::string ToString(const T& v) { } // namespace art -#endif // ART_SRC_BASE_STL_UTIL_H_ +#endif // ART_RUNTIME_BASE_STL_UTIL_H_ diff --git a/runtime/base/stringpiece.h b/runtime/base/stringpiece.h index 3664218860..62088cc183 100644 --- a/runtime/base/stringpiece.h +++ b/runtime/base/stringpiece.h @@ -25,8 +25,8 @@ // Systematic usage of StringPiece is encouraged as it will reduce unnecessary // conversions from "const char*" to "string" and back again. -#ifndef ART_SRC_BASE_STRINGPIECE_H_ -#define ART_SRC_BASE_STRINGPIECE_H_ +#ifndef ART_RUNTIME_BASE_STRINGPIECE_H_ +#define ART_RUNTIME_BASE_STRINGPIECE_H_ #include <string.h> #include <algorithm> @@ -223,4 +223,4 @@ struct StringPieceHash { } // namespace art -#endif // ART_SRC_BASE_STRINGPIECE_H_ +#endif // ART_RUNTIME_BASE_STRINGPIECE_H_ diff --git a/runtime/base/stringprintf.h b/runtime/base/stringprintf.h index d707cc02d6..4767a750c3 100644 --- a/runtime/base/stringprintf.h +++ b/runtime/base/stringprintf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_BASE_STRINGPRINTF_H_ -#define ART_SRC_BASE_STRINGPRINTF_H_ +#ifndef ART_RUNTIME_BASE_STRINGPRINTF_H_ +#define ART_RUNTIME_BASE_STRINGPRINTF_H_ #include <stdarg.h> #include <string> @@ -35,4 +35,4 @@ void StringAppendV(std::string* dst, const char* format, va_list ap); } // namespace art -#endif // ART_SRC_BASE_STRINGPRINTF_H_ +#endif // ART_RUNTIME_BASE_STRINGPRINTF_H_ diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h index 65732b170d..816cbeadec 100644 --- a/runtime/base/timing_logger.h +++ b/runtime/base/timing_logger.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_TIMING_LOGGER_H_ -#define ART_SRC_TIMING_LOGGER_H_ +#ifndef ART_RUNTIME_BASE_TIMING_LOGGER_H_ +#define ART_RUNTIME_BASE_TIMING_LOGGER_H_ #include "base/histogram.h" #include "base/macros.h" @@ -139,4 +139,4 @@ class NewTimingLogger { } // namespace base } // namespace art -#endif // ART_SRC_TIMING_LOGGER_H_ +#endif // ART_RUNTIME_BASE_TIMING_LOGGER_H_ diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h index 2b339613ba..79a0db9eda 100644 --- a/runtime/base/unix_file/fd_file.h +++ b/runtime/base/unix_file/fd_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_FD_FILE_H_ -#define BASE_UNIX_FILE_FD_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ #include <fcntl.h> #include <string> @@ -72,4 +72,4 @@ class FdFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_FD_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_ diff --git a/runtime/base/unix_file/mapped_file.h b/runtime/base/unix_file/mapped_file.h index 161100b0d5..28cc5514f7 100644 --- a/runtime/base/unix_file/mapped_file.h +++ b/runtime/base/unix_file/mapped_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_MAPPED_FILE_H_ -#define BASE_UNIX_FILE_MAPPED_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ #include <fcntl.h> #include <string> @@ -94,4 +94,4 @@ class MappedFile : public FdFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_MAPPED_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_ diff --git a/runtime/base/unix_file/null_file.h b/runtime/base/unix_file/null_file.h index e716603687..33947311f0 100644 --- a/runtime/base/unix_file/null_file.h +++ b/runtime/base/unix_file/null_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_NULL_FILE_H_ -#define BASE_UNIX_FILE_NULL_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ #include "base/unix_file/random_access_file.h" #include "base/macros.h" @@ -47,4 +47,4 @@ class NullFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_NULL_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_ diff --git a/runtime/base/unix_file/random_access_file.h b/runtime/base/unix_file/random_access_file.h index 22da37f03e..31a6dbe1fc 100644 --- a/runtime/base/unix_file/random_access_file.h +++ b/runtime/base/unix_file/random_access_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ #include <stdint.h> @@ -65,4 +65,4 @@ class RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_ diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h index 3baaeae8ac..9d8550d6f6 100644 --- a/runtime/base/unix_file/random_access_file_test.h +++ b/runtime/base/unix_file/random_access_file_test.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ #include <errno.h> @@ -169,4 +169,4 @@ class RandomAccessFileTest : public testing::Test { } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_ diff --git a/runtime/base/unix_file/random_access_file_utils.h b/runtime/base/unix_file/random_access_file_utils.h index 0535ead8c5..30c81c09aa 100644 --- a/runtime/base/unix_file/random_access_file_utils.h +++ b/runtime/base/unix_file/random_access_file_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ -#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ namespace unix_file { @@ -27,4 +27,4 @@ bool CopyFile(const RandomAccessFile& src, RandomAccessFile* dst); } // namespace unix_file -#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_ diff --git a/runtime/base/unix_file/string_file.h b/runtime/base/unix_file/string_file.h index 8944373344..26904f89a6 100644 --- a/runtime/base/unix_file/string_file.h +++ b/runtime/base/unix_file/string_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef BASE_UNIX_FILE_STRING_FILE_H_ -#define BASE_UNIX_FILE_STRING_FILE_H_ +#ifndef ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ +#define ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ #include <stdint.h> @@ -56,4 +56,4 @@ class StringFile : public RandomAccessFile { } // namespace unix_file -#endif // BASE_UNIX_FILE_STRING_FILE_H_ +#endif // ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_ diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h index 6cf49912a2..4d01b66f0a 100644 --- a/runtime/class_linker-inl.h +++ b/runtime/class_linker-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_LINKER_INL_H_ -#define ART_SRC_CLASS_LINKER_INL_H_ +#ifndef ART_RUNTIME_CLASS_LINKER_INL_H_ +#define ART_RUNTIME_CLASS_LINKER_INL_H_ #include "class_linker.h" @@ -143,4 +143,4 @@ inline mirror::Class* ClassLinker::GetClassRoot(ClassRoot class_root) } // namespace art -#endif // ART_SRC_CLASS_LINKER_INL_H_ +#endif // ART_RUNTIME_CLASS_LINKER_INL_H_ diff --git a/runtime/class_linker.h b/runtime/class_linker.h index df1ecc6207..3993cb214b 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_LINKER_H_ -#define ART_SRC_CLASS_LINKER_H_ +#ifndef ART_RUNTIME_CLASS_LINKER_H_ +#define ART_RUNTIME_CLASS_LINKER_H_ #include <string> #include <utility> @@ -627,4 +627,4 @@ class ClassLinker { } // namespace art -#endif // ART_SRC_CLASS_LINKER_H_ +#endif // ART_RUNTIME_CLASS_LINKER_H_ diff --git a/runtime/class_reference.h b/runtime/class_reference.h index c3be720ea5..77c296facd 100644 --- a/runtime/class_reference.h +++ b/runtime/class_reference.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLASS_REFERENCE_H_ -#define ART_SRC_CLASS_REFERENCE_H_ +#ifndef ART_RUNTIME_CLASS_REFERENCE_H_ +#define ART_RUNTIME_CLASS_REFERENCE_H_ #include <stdint.h> @@ -38,4 +38,4 @@ inline bool operator<(const ClassReference& lhs, const ClassReference& rhs) { } // namespace art -#endif // ART_SRC_CLASS_REFERENCE_H_ +#endif // ART_RUNTIME_CLASS_REFERENCE_H_ diff --git a/runtime/closure.h b/runtime/closure.h index 17f2b84d82..9bea28fa58 100644 --- a/runtime/closure.h +++ b/runtime/closure.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CLOSURE_H_ -#define ART_SRC_CLOSURE_H_ +#ifndef ART_RUNTIME_CLOSURE_H_ +#define ART_RUNTIME_CLOSURE_H_ namespace art { @@ -29,4 +29,4 @@ class Closure { } // namespace art -#endif // ART_SRC_CLOSURE_H_ +#endif // ART_RUNTIME_CLOSURE_H_ diff --git a/runtime/common_test.h b/runtime/common_test.h index f03b1f9cdb..73c47b5a8c 100644 --- a/runtime/common_test.h +++ b/runtime/common_test.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_COMMON_TEST_H_ +#define ART_RUNTIME_COMMON_TEST_H_ + #include <dirent.h> #include <dlfcn.h> #include <sys/mman.h> @@ -586,3 +589,5 @@ std::ostream& operator<<(std::ostream& os, const std::vector<T>& rhs) { } } // namespace std + +#endif // ART_RUNTIME_COMMON_TEST_H_ diff --git a/runtime/common_throws.h b/runtime/common_throws.h index 4bf12c0d01..b7f2754df1 100644 --- a/runtime/common_throws.h +++ b/runtime/common_throws.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMMON_THROWS__H_ -#define ART_SRC_COMMON_THROWS_H_ +#ifndef ART_RUNTIME_COMMON_THROWS_H_ +#define ART_RUNTIME_COMMON_THROWS_H_ #include "base/mutex.h" #include "invoke_type.h" @@ -183,4 +183,4 @@ void ThrowVerifyError(const mirror::Class* referrer, const char* fmt, ...) } // namespace art -#endif // ART_SRC_COMMON_THROWS_H_ +#endif // ART_RUNTIME_COMMON_THROWS_H_ diff --git a/runtime/compiled_class.h b/runtime/compiled_class.h index f050ee6a7e..c53d500502 100644 --- a/runtime/compiled_class.h +++ b/runtime/compiled_class.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILED_CLASS_H_ -#define ART_SRC_COMPILED_CLASS_H_ +#ifndef ART_RUNTIME_COMPILED_CLASS_H_ +#define ART_RUNTIME_COMPILED_CLASS_H_ #include "mirror/class.h" @@ -34,4 +34,4 @@ class CompiledClass { } // namespace art -#endif // ART_SRC_COMPILED_CLASS_H_ +#endif // ART_RUNTIME_COMPILED_CLASS_H_ diff --git a/runtime/compiled_method.h b/runtime/compiled_method.h index fb0172cc19..800dde2208 100644 --- a/runtime/compiled_method.h +++ b/runtime/compiled_method.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILED_METHOD_H_ -#define ART_SRC_COMPILED_METHOD_H_ +#ifndef ART_RUNTIME_COMPILED_METHOD_H_ +#define ART_RUNTIME_COMPILED_METHOD_H_ #include <string> #include <vector> @@ -177,4 +177,4 @@ class CompiledMethod : public CompiledCode { } // namespace art -#endif // ART_SRC_COMPILED_METHOD_H_ +#endif // ART_RUNTIME_COMPILED_METHOD_H_ diff --git a/runtime/constants_arm.h b/runtime/constants_arm.h index 601c57247e..bbb9242def 100644 --- a/runtime/constants_arm.h +++ b/runtime/constants_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_ARM_H_ -#define ART_SRC_CONSTANTS_ARM_H_ +#ifndef ART_RUNTIME_CONSTANTS_ARM_H_ +#define ART_RUNTIME_CONSTANTS_ARM_H_ #include <stdint.h> @@ -516,4 +516,4 @@ class Instr { } // namespace arm } // namespace art -#endif // ART_SRC_CONSTANTS_ARM_H_ +#endif // ART_RUNTIME_CONSTANTS_ARM_H_ diff --git a/runtime/constants_mips.h b/runtime/constants_mips.h index 87a13554fb..fb56493a14 100644 --- a/runtime/constants_mips.h +++ b/runtime/constants_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_MIPS_H_ -#define ART_SRC_CONSTANTS_MIPS_H_ +#ifndef ART_RUNTIME_CONSTANTS_MIPS_H_ +#define ART_RUNTIME_CONSTANTS_MIPS_H_ #include <iosfwd> @@ -183,4 +183,4 @@ class Instr { } // namespace mips } // namespace art -#endif // ART_SRC_CONSTANTS_MIPS_H_ +#endif // ART_RUNTIME_CONSTANTS_MIPS_H_ diff --git a/runtime/constants_x86.h b/runtime/constants_x86.h index e48b281599..bb18b6b23b 100644 --- a/runtime/constants_x86.h +++ b/runtime/constants_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_X86_H_ -#define ART_SRC_CONSTANTS_X86_H_ +#ifndef ART_RUNTIME_CONSTANTS_X86_H_ +#define ART_RUNTIME_CONSTANTS_X86_H_ #include <iosfwd> @@ -137,4 +137,4 @@ class Instr { } // namespace x86 } // namespace art -#endif // ART_SRC_CONSTANTS_X86_H_ +#endif // ART_RUNTIME_CONSTANTS_X86_H_ diff --git a/runtime/debugger.h b/runtime/debugger.h index eb17695249..94f3cbed76 100644 --- a/runtime/debugger.h +++ b/runtime/debugger.h @@ -18,8 +18,8 @@ * Dalvik-specific side of debugger support. (The JDWP code is intended to * be relatively generic.) */ -#ifndef ART_DEBUGGER_H_ -#define ART_DEBUGGER_H_ +#ifndef ART_RUNTIME_DEBUGGER_H_ +#define ART_RUNTIME_DEBUGGER_H_ #include <pthread.h> @@ -429,4 +429,4 @@ class Dbg { } // namespace art -#endif // ART_DEBUGGER_H_ +#endif // ART_RUNTIME_DEBUGGER_H_ diff --git a/runtime/dex_file-inl.h b/runtime/dex_file-inl.h index 5d8216eda5..dee80269d6 100644 --- a/runtime/dex_file-inl.h +++ b/runtime/dex_file-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_INL_H_ -#define ART_SRC_DEX_FILE_INL_H_ +#ifndef ART_RUNTIME_DEX_FILE_INL_H_ +#define ART_RUNTIME_DEX_FILE_INL_H_ #include "base/logging.h" #include "dex_file.h" @@ -44,4 +44,4 @@ inline const DexFile::TryItem* DexFile::GetTryItems(const CodeItem& code_item, u } // namespace art -#endif // ART_SRC_DEX_FILE_INL_H_ +#endif // ART_RUNTIME_DEX_FILE_INL_H_ diff --git a/runtime/dex_file.h b/runtime/dex_file.h index e09270e018..28e06cc5b9 100644 --- a/runtime/dex_file.h +++ b/runtime/dex_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_H_ -#define ART_SRC_DEX_FILE_H_ +#ifndef ART_RUNTIME_DEX_FILE_H_ +#define ART_RUNTIME_DEX_FILE_H_ #include <string> #include <vector> @@ -1220,4 +1220,4 @@ class CatchHandlerIterator { } // namespace art -#endif // ART_SRC_DEX_FILE_H_ +#endif // ART_RUNTIME_DEX_FILE_H_ diff --git a/runtime/dex_file_verifier.h b/runtime/dex_file_verifier.h index 5538d4aa75..3797dc77e5 100644 --- a/runtime/dex_file_verifier.h +++ b/runtime/dex_file_verifier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_FILE_VERIFIER_H_ -#define ART_SRC_DEX_FILE_VERIFIER_H_ +#ifndef ART_RUNTIME_DEX_FILE_VERIFIER_H_ +#define ART_RUNTIME_DEX_FILE_VERIFIER_H_ #include "dex_file.h" #include "safe_map.h" @@ -94,4 +94,4 @@ class DexFileVerifier { } // namespace art -#endif // ART_SRC_DEX_FILE_VERIFIER_H_ +#endif // ART_RUNTIME_DEX_FILE_VERIFIER_H_ diff --git a/runtime/dex_instruction-inl.h b/runtime/dex_instruction-inl.h index b426e66a1c..2cb5235417 100644 --- a/runtime/dex_instruction-inl.h +++ b/runtime/dex_instruction-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_INL_H_ -#define ART_SRC_DEX_INSTRUCTION_INL_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_INL_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_INL_H_ #include "dex_instruction.h" @@ -319,4 +319,4 @@ inline void Instruction::GetArgs(uint32_t arg[5]) const { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_INL_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_INL_H_ diff --git a/runtime/dex_instruction.h b/runtime/dex_instruction.h index 0407c57935..d2ad989395 100644 --- a/runtime/dex_instruction.h +++ b/runtime/dex_instruction.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_H_ -#define ART_SRC_DEX_INSTRUCTION_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_H_ #include "base/logging.h" #include "base/macros.h" @@ -443,4 +443,4 @@ struct DecodedInstruction { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_H_ diff --git a/runtime/dex_instruction_list.h b/runtime/dex_instruction_list.h index 8257c783e7..31d51c9b41 100644 --- a/runtime/dex_instruction_list.h +++ b/runtime/dex_instruction_list.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ + #define DEX_INSTRUCTION_LIST(V) \ V(0x00, NOP, "nop", k10x, false, kNone, kContinue, kVerifyNone) \ V(0x01, MOVE, "move", k12x, true, kNone, kContinue, kVerifyRegA | kVerifyRegB) \ @@ -297,3 +300,6 @@ V(k35c) \ V(k3rc) \ V(k51l) + +#endif // ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ +#undef ART_RUNTIME_DEX_INSTRUCTION_LIST_H_ // the guard in this file is just for cpplint diff --git a/runtime/dex_instruction_visitor.h b/runtime/dex_instruction_visitor.h index ff4620f8f0..795b95bf76 100644 --- a/runtime/dex_instruction_visitor.h +++ b/runtime/dex_instruction_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_INSTRUCTION_VISITOR_H_ -#define ART_SRC_DEX_INSTRUCTION_VISITOR_H_ +#ifndef ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ +#define ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ #include "base/macros.h" #include "dex_instruction.h" @@ -69,4 +69,4 @@ class DexInstructionVisitor { } // namespace art -#endif // ART_SRC_DEX_INSTRUCTION_VISITOR_H_ +#endif // ART_RUNTIME_DEX_INSTRUCTION_VISITOR_H_ diff --git a/runtime/dex_method_iterator.h b/runtime/dex_method_iterator.h index dc2e712681..cb71cb5b11 100644 --- a/runtime/dex_method_iterator.h +++ b/runtime/dex_method_iterator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DEX_METHOD_ITERATOR_H_ -#define ART_SRC_DEX_METHOD_ITERATOR_H_ +#ifndef ART_RUNTIME_DEX_METHOD_ITERATOR_H_ +#define ART_RUNTIME_DEX_METHOD_ITERATOR_H_ #include <vector> @@ -147,4 +147,4 @@ class DexMethodIterator { } // namespace art -#endif // ART_SRC_DEX_METHOD_ITERATOR_H_ +#endif // ART_RUNTIME_DEX_METHOD_ITERATOR_H_ diff --git a/runtime/disassembler.h b/runtime/disassembler.h index 1f50bfc9c0..805ff4d079 100644 --- a/runtime/disassembler.h +++ b/runtime/disassembler.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_H_ -#define ART_SRC_DISASSEMBLER_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_H_ +#define ART_RUNTIME_DISASSEMBLER_H_ #include <stdint.h> @@ -45,4 +45,4 @@ class Disassembler { } // namespace art -#endif // ART_SRC_DISASSEMBLER_H_ +#endif // ART_RUNTIME_DISASSEMBLER_H_ diff --git a/runtime/disassembler_arm.h b/runtime/disassembler_arm.h index 103876f33b..cab9150108 100644 --- a/runtime/disassembler_arm.h +++ b/runtime/disassembler_arm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_ARM_H_ -#define ART_SRC_DISASSEMBLER_ARM_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_ARM_H_ +#define ART_RUNTIME_DISASSEMBLER_ARM_H_ #include <vector> @@ -48,4 +48,4 @@ class DisassemblerArm : public Disassembler { } // namespace arm } // namespace art -#endif // ART_SRC_DISASSEMBLER_ARM_H_ +#endif // ART_RUNTIME_DISASSEMBLER_ARM_H_ diff --git a/runtime/disassembler_mips.h b/runtime/disassembler_mips.h index ed45113db7..e248503963 100644 --- a/runtime/disassembler_mips.h +++ b/runtime/disassembler_mips.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_MIPS_H_ -#define ART_SRC_DISASSEMBLER_MIPS_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_MIPS_H_ +#define ART_RUNTIME_DISASSEMBLER_MIPS_H_ #include <vector> @@ -37,4 +37,4 @@ class DisassemblerMips : public Disassembler { } // namespace mips } // namespace art -#endif // ART_SRC_DISASSEMBLER_MIPS_H_ +#endif // ART_RUNTIME_DISASSEMBLER_MIPS_H_ diff --git a/runtime/disassembler_x86.h b/runtime/disassembler_x86.h index 13f8503720..ff4322c8b8 100644 --- a/runtime/disassembler_x86.h +++ b/runtime/disassembler_x86.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_DISASSEMBLER_X86_H_ -#define ART_SRC_DISASSEMBLER_X86_H_ +#ifndef ART_RUNTIME_DISASSEMBLER_X86_H_ +#define ART_RUNTIME_DISASSEMBLER_X86_H_ #include "disassembler.h" @@ -35,4 +35,4 @@ class DisassemblerX86 : public Disassembler { } // namespace x86 } // namespace art -#endif // ART_SRC_DISASSEMBLER_X86_H_ +#endif // ART_RUNTIME_DISASSEMBLER_X86_H_ diff --git a/runtime/elf_file.h b/runtime/elf_file.h index cb95cb0df0..33b5fc3f9b 100644 --- a/runtime/elf_file.h +++ b/runtime/elf_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ELF_FILE_H_ -#define ART_SRC_ELF_FILE_H_ +#ifndef ART_RUNTIME_ELF_FILE_H_ +#define ART_RUNTIME_ELF_FILE_H_ #include <map> #include <vector> @@ -172,4 +172,4 @@ class ElfFile { } // namespace art -#endif // ART_SRC_ELF_FILE_H_ +#endif // ART_RUNTIME_ELF_FILE_H_ diff --git a/runtime/file_output_stream.h b/runtime/file_output_stream.h index b5eb4f8194..10405eff1f 100644 --- a/runtime/file_output_stream.h +++ b/runtime/file_output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_FILE_OUTPUT_STREAM_H_ -#define ART_SRC_FILE_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_FILE_OUTPUT_STREAM_H_ +#define ART_RUNTIME_FILE_OUTPUT_STREAM_H_ #include "output_stream.h" @@ -41,4 +41,4 @@ class FileOutputStream : public OutputStream { } // namespace art -#endif // ART_SRC_FILE_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_FILE_OUTPUT_STREAM_H_ diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h index 4e1c253bdf..5310c18ec6 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 @@ typedef AtomicStack<mirror::Object*> ObjectStack; } // 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 1e7529084a..f8f2773582 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 @@ inline void CardTable::CheckCardValid(byte* card) const { } // 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 cf85d15448..1acaf5bdfc 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 @@ class CardTable { } // 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 8e3123b974..76226041d1 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 @@ inline void HeapBitmap::Visit(const Visitor& visitor) { } // 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 5ff40c6426..a12809ea55 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 @@ class HeapBitmap { } // 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 656af94853..32ac95f9f8 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 @@ class ModUnionTableToAllocspace : public ModUnionTableReferenceCache { } // 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 5d25e05658..543562563b 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 @@ class ModUnionTableCardCache : public ModUnionTable { } // 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 a4fd330c8f..d074a0f578 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 @@ inline bool SpaceBitmap::Modify(const mirror::Object* obj, bool do_set) { } // 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 bb487d88d0..32ab440f31 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 @@ std::ostream& operator << (std::ostream& stream, const SpaceBitmap& bitmap); } // 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 6b02a44ffe..07ebd1c0e3 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 @@ extern "C" int dlmalloc_trim(size_t); // 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 1ab395775b..a22faac43b 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 @@ class GarbageCollector { } // 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 bb25bb93f9..f18e40fa74 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 @@ std::ostream& operator<<(std::ostream& os, const GcType& policy); } // 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 ea9fced84a..6b1b617eb4 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 @@ inline void MarkSweep::VisitObjectArrayReferences(const mirror::ObjectArray<mirr } // 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 9df3c19939..34136d454d 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 @@ class MarkSweep : public GarbageCollector { } // 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 bd4a580450..718c62e5f0 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 @@ protected: } // 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 b16cfc1b49..8cd4aedf62 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 @@ protected: } // 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 e6c92211d4..630d063ff0 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 @@ class Heap { } // 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 00df0e6d42..8a4314c716 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 @@ class DlMallocSpace : public MemMapSpace, public AllocSpace { } // 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 833fb8d73a..fde2b419ac 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 @@ class ImageSpace : public MemMapSpace { } // 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 197fad3854..74d9cca6db 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 @@ class FreeListSpace : public LargeObjectSpace { } // 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 54bf604822..2c3b93c60d 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 @@ inline LargeObjectSpace* Space::AsLargeObjectSpace() { } // 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 ca01c55497..48f0579d83 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 @@ class MemMapSpace : public ContinuousSpace { } // namespace gc } // namespace art -#endif // ART_SRC_GC_SPACE_SPACE_H_ +#endif // ART_RUNTIME_GC_SPACE_SPACE_H_ diff --git a/runtime/gc_map.h b/runtime/gc_map.h index 473b39a629..33d09f29f6 100644 --- a/runtime/gc_map.h +++ b/runtime/gc_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GC_MAP_H_ -#define ART_SRC_GC_MAP_H_ +#ifndef ART_RUNTIME_GC_MAP_H_ +#define ART_RUNTIME_GC_MAP_H_ #include <stdint.h> @@ -108,4 +108,4 @@ class NativePcOffsetToReferenceMap { } // namespace art -#endif // ART_SRC_GC_MAP_H_ +#endif // ART_RUNTIME_GC_MAP_H_ diff --git a/runtime/globals.h b/runtime/globals.h index dc9341ae0f..c3974943cd 100644 --- a/runtime/globals.h +++ b/runtime/globals.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_GLOBALS_H_ -#define ART_SRC_GLOBALS_H_ +#ifndef ART_RUNTIME_GLOBALS_H_ +#define ART_RUNTIME_GLOBALS_H_ #include <stddef.h> #include <stdint.h> @@ -75,4 +75,4 @@ const bool kIsTargetBuild = false; } // namespace art -#endif // ART_SRC_GLOBALS_H_ +#endif // ART_RUNTIME_GLOBALS_H_ diff --git a/runtime/hprof/hprof.h b/runtime/hprof/hprof.h index c6222dcb90..91684648a5 100644 --- a/runtime/hprof/hprof.h +++ b/runtime/hprof/hprof.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef HPROF_HPROF_H_ -#define HPROF_HPROF_H_ +#ifndef ART_RUNTIME_HPROF_HPROF_H_ +#define ART_RUNTIME_HPROF_HPROF_H_ namespace art { @@ -27,4 +27,4 @@ void DumpHeap(const char* filename, int fd, bool direct_to_ddms); } // namespace art -#endif // HPROF_HPROF_H_ +#endif // ART_RUNTIME_HPROF_HPROF_H_ diff --git a/runtime/image.h b/runtime/image.h index f14d7d190a..35e4c5cabd 100644 --- a/runtime/image.h +++ b/runtime/image.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_IMAGE_H_ -#define ART_SRC_IMAGE_H_ +#ifndef ART_RUNTIME_IMAGE_H_ +#define ART_RUNTIME_IMAGE_H_ #include <string.h> @@ -131,4 +131,4 @@ class PACKED(4) ImageHeader { } // namespace art -#endif // ART_SRC_IMAGE_H_ +#endif // ART_RUNTIME_IMAGE_H_ diff --git a/runtime/indenter.h b/runtime/indenter.h index 4ac0c01163..c432e1ba8d 100644 --- a/runtime/indenter.h +++ b/runtime/indenter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INDENTER_H_ -#define ART_SRC_INDENTER_H_ +#ifndef ART_RUNTIME_INDENTER_H_ +#define ART_RUNTIME_INDENTER_H_ #include "base/macros.h" #include <streambuf> @@ -60,4 +60,4 @@ class Indenter : public std::streambuf { DISALLOW_COPY_AND_ASSIGN(Indenter); }; -#endif // ART_SRC_INDENTER_H_ +#endif // ART_RUNTIME_INDENTER_H_ diff --git a/runtime/indirect_reference_table.h b/runtime/indirect_reference_table.h index e09043dba7..34b0f3abe2 100644 --- a/runtime/indirect_reference_table.h +++ b/runtime/indirect_reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INDIRECT_REFERENCE_TABLE_H_ -#define ART_SRC_INDIRECT_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ +#define ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ #include <stdint.h> @@ -378,4 +378,4 @@ class IndirectReferenceTable { } // namespace art -#endif // ART_SRC_INDIRECT_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_INDIRECT_REFERENCE_TABLE_H_ diff --git a/runtime/instruction_set.h b/runtime/instruction_set.h index c4dae4dcb6..2217f7f76e 100644 --- a/runtime/instruction_set.h +++ b/runtime/instruction_set.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INSTRUCTION_SET_H_ -#define ART_SRC_INSTRUCTION_SET_H_ +#ifndef ART_RUNTIME_INSTRUCTION_SET_H_ +#define ART_RUNTIME_INSTRUCTION_SET_H_ #include <iosfwd> @@ -33,4 +33,4 @@ std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs); } // namespace art -#endif // ART_SRC_INSTRUCTION_SET_H_ +#endif // ART_RUNTIME_INSTRUCTION_SET_H_ diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 5fea34f388..e0f1fa978b 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INSTRUMENTATION_H_ -#define ART_SRC_INSTRUMENTATION_H_ +#ifndef ART_RUNTIME_INSTRUMENTATION_H_ +#define ART_RUNTIME_INSTRUMENTATION_H_ #include "base/macros.h" #include "locks.h" @@ -290,4 +290,4 @@ struct InstrumentationStackFrame { } // namespace instrumentation } // namespace art -#endif // ART_SRC_INSTRUMENTATION_H_ +#endif // ART_RUNTIME_INSTRUMENTATION_H_ diff --git a/runtime/intern_table.h b/runtime/intern_table.h index 1ff4f6d3c6..5031ce3c5a 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INTERN_TABLE_H_ -#define ART_SRC_INTERN_TABLE_H_ +#ifndef ART_RUNTIME_INTERN_TABLE_H_ +#define ART_RUNTIME_INTERN_TABLE_H_ #include "base/mutex.h" #include "root_visitor.h" @@ -95,4 +95,4 @@ class InternTable { } // namespace art -#endif // ART_SRC_CLASS_LINKER_H_ +#endif // ART_RUNTIME_INTERN_TABLE_H_ diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h index 20166ac545..17884b9a63 100644 --- a/runtime/interpreter/interpreter.h +++ b/runtime/interpreter/interpreter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INTERPRETER_INTERPRETER_H_ -#define ART_SRC_INTERPRETER_INTERPRETER_H_ +#ifndef ART_RUNTIME_INTERPRETER_INTERPRETER_H_ +#define ART_RUNTIME_INTERPRETER_INTERPRETER_H_ #include "dex_file.h" #include "locks.h" @@ -55,4 +55,4 @@ extern "C" void artInterpreterToInterpreterEntry(Thread* self, MethodHelper& mh, } // namespace interpreter } // namespace art -#endif // ART_SRC_INTERPRETER_INTERPRETER_H_ +#endif // ART_RUNTIME_INTERPRETER_INTERPRETER_H_ diff --git a/runtime/invoke_arg_array_builder.h b/runtime/invoke_arg_array_builder.h index b57d60a70f..c1d8249fd3 100644 --- a/runtime/invoke_arg_array_builder.h +++ b/runtime/invoke_arg_array_builder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ -#define ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ +#ifndef ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ +#define ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ #include "mirror/object.h" #include "scoped_thread_state_change.h" @@ -180,4 +180,4 @@ class ArgArray { } // namespace art -#endif // ART_SRC_INVOKE_ARG_ARRAY_BUILDER_H_ +#endif // ART_RUNTIME_INVOKE_ARG_ARRAY_BUILDER_H_ diff --git a/runtime/invoke_type.h b/runtime/invoke_type.h index d724fdb9c1..cdf9be87d9 100644 --- a/runtime/invoke_type.h +++ b/runtime/invoke_type.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_INVOKE_TYPE_H_ -#define ART_SRC_INVOKE_TYPE_H_ +#ifndef ART_RUNTIME_INVOKE_TYPE_H_ +#define ART_RUNTIME_INVOKE_TYPE_H_ #include <iosfwd> @@ -34,4 +34,4 @@ std::ostream& operator<<(std::ostream& os, const InvokeType& rhs); } // namespace art -#endif // ART_SRC_INVOKE_TYPE_H_ +#endif // ART_RUNTIME_INVOKE_TYPE_H_ diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h index 436525c3d0..6a5d0d19fb 100644 --- a/runtime/jdwp/jdwp.h +++ b/runtime/jdwp/jdwp.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_JDWP_H_ -#define ART_JDWP_JDWP_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_H_ +#define ART_RUNTIME_JDWP_JDWP_H_ #include "base/mutex.h" #include "jdwp/jdwp_bits.h" @@ -429,4 +429,4 @@ class Request { } // namespace art -#endif // ART_JDWP_JDWP_H_ +#endif // ART_RUNTIME_JDWP_JDWP_H_ diff --git a/runtime/jdwp/jdwp_bits.h b/runtime/jdwp/jdwp_bits.h index 2a3c775164..9f80cbe307 100644 --- a/runtime/jdwp/jdwp_bits.h +++ b/runtime/jdwp/jdwp_bits.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_BITS_H_ -#define ART_JDWP_BITS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_BITS_H_ +#define ART_RUNTIME_JDWP_JDWP_BITS_H_ #include <stddef.h> #include <stdint.h> @@ -121,4 +121,4 @@ static inline void Write8BE(uint8_t** dst, uint64_t value) { } // namespace art -#endif // ART_JDWP_BITS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_BITS_H_ diff --git a/runtime/jdwp/jdwp_constants.h b/runtime/jdwp/jdwp_constants.h index ebc575b6b6..a8db325c66 100644 --- a/runtime/jdwp/jdwp_constants.h +++ b/runtime/jdwp/jdwp_constants.h @@ -16,8 +16,8 @@ /* * These come out of the JDWP documentation. */ -#ifndef ART_JDWP_JDWPCONSTANTS_H_ -#define ART_JDWP_JDWPCONSTANTS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ +#define ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ #include <iosfwd> @@ -246,4 +246,4 @@ std::ostream& operator<<(std::ostream& os, const JdwpTag& value); } // namespace art -#endif // ART_JDWP_JDWPCONSTANTS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ diff --git a/runtime/jdwp/jdwp_event.h b/runtime/jdwp/jdwp_event.h index a6eabb1371..d269761999 100644 --- a/runtime/jdwp/jdwp_event.h +++ b/runtime/jdwp/jdwp_event.h @@ -16,8 +16,8 @@ /* * Handle registration of events, and debugger event notification. */ -#ifndef ART_JDWP_JDWPEVENT_H_ -#define ART_JDWP_JDWPEVENT_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EVENT_H_ +#define ART_RUNTIME_JDWP_JDWP_EVENT_H_ #include "jdwp/jdwp.h" #include "jdwp/jdwp_constants.h" @@ -110,4 +110,4 @@ void EventFree(JdwpEvent* pEvent); } // namespace art -#endif // ART_JDWP_JDWPEVENT_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EVENT_H_ diff --git a/runtime/jdwp/jdwp_expand_buf.h b/runtime/jdwp/jdwp_expand_buf.h index 820f62d6a0..81e01e2100 100644 --- a/runtime/jdwp/jdwp_expand_buf.h +++ b/runtime/jdwp/jdwp_expand_buf.h @@ -16,8 +16,8 @@ /* * Expanding byte buffer, with primitives for appending basic data types. */ -#ifndef ART_JDWP_EXPANDBUF_H_ -#define ART_JDWP_EXPANDBUF_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ +#define ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ #include <string> @@ -67,4 +67,4 @@ void expandBufAddLocation(ExpandBuf* pReply, const JdwpLocation& location); } // namespace art -#endif // ART_JDWP_EXPANDBUF_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ diff --git a/runtime/jdwp/jdwp_priv.h b/runtime/jdwp/jdwp_priv.h index c8a7b2686d..ab89339347 100644 --- a/runtime/jdwp/jdwp_priv.h +++ b/runtime/jdwp/jdwp_priv.h @@ -16,8 +16,8 @@ /* * JDWP internal interfaces. */ -#ifndef ART_JDWP_JDWPPRIV_H_ -#define ART_JDWP_JDWPPRIV_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_PRIV_H_ +#define ART_RUNTIME_JDWP_JDWP_PRIV_H_ #include "debugger.h" #include "jdwp/jdwp.h" @@ -101,4 +101,4 @@ class JdwpNetStateBase { } // namespace art -#endif // ART_JDWP_JDWPPRIV_H_ +#endif // ART_RUNTIME_JDWP_JDWP_PRIV_H_ diff --git a/runtime/jdwp/object_registry.h b/runtime/jdwp/object_registry.h index d0ea59da71..345f0ad73a 100644 --- a/runtime/jdwp/object_registry.h +++ b/runtime/jdwp/object_registry.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ +#define ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ + #include <stdint.h> #include <map> @@ -98,3 +101,5 @@ class ObjectRegistry { }; } // namespace art + +#endif // ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ diff --git a/runtime/jni_internal.h b/runtime/jni_internal.h index 7b43f95cb3..ad66ada329 100644 --- a/runtime/jni_internal.h +++ b/runtime/jni_internal.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JNI_INTERNAL_H_ -#define ART_SRC_JNI_INTERNAL_H_ +#ifndef ART_RUNTIME_JNI_INTERNAL_H_ +#define ART_RUNTIME_JNI_INTERNAL_H_ #include "jni.h" @@ -198,4 +198,4 @@ class ScopedJniEnvLocalRefState { std::ostream& operator<<(std::ostream& os, const jobjectRefType& rhs); -#endif // ART_SRC_JNI_INTERNAL_H_ +#endif // ART_RUNTIME_JNI_INTERNAL_H_ diff --git a/runtime/jobject_comparator.h b/runtime/jobject_comparator.h index 17098aaebb..698d6678d6 100644 --- a/runtime/jobject_comparator.h +++ b/runtime/jobject_comparator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JOBJECT_COMPARATOR_H_ -#define ART_SRC_JOBJECT_COMPARATOR_H_ +#ifndef ART_RUNTIME_JOBJECT_COMPARATOR_H_ +#define ART_RUNTIME_JOBJECT_COMPARATOR_H_ #include <jni.h> @@ -27,4 +27,4 @@ struct JobjectComparator { } // namespace art -#endif // ART_SRC_JOBJECT_COMPARATOR_H_ +#endif // ART_RUNTIME_JOBJECT_COMPARATOR_H_ diff --git a/runtime/jvalue.h b/runtime/jvalue.h index 66cd93e2c0..0c1aadb462 100644 --- a/runtime/jvalue.h +++ b/runtime/jvalue.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_JVALUE_H_ -#define ART_SRC_JVALUE_H_ +#ifndef ART_RUNTIME_JVALUE_H_ +#define ART_RUNTIME_JVALUE_H_ #include "base/macros.h" @@ -75,4 +75,4 @@ union PACKED(4) JValue { } // namespace art -#endif // ART_SRC_JVALUE_H_ +#endif // ART_RUNTIME_JVALUE_H_ diff --git a/runtime/leb128.h b/runtime/leb128.h index a5a6683aee..ca955b0921 100644 --- a/runtime/leb128.h +++ b/runtime/leb128.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_LEB128_H_ -#define ART_SRC_LEB128_H_ +#ifndef ART_RUNTIME_LEB128_H_ +#define ART_RUNTIME_LEB128_H_ #include "globals.h" @@ -121,4 +121,4 @@ static inline uint8_t* WriteUnsignedLeb128(uint8_t* ptr, uint32_t data) { } // namespace art -#endif // ART_SRC_LEB128_H_ +#endif // ART_RUNTIME_LEB128_H_ diff --git a/runtime/locks.h b/runtime/locks.h index 91437e1830..6b0e96f8b9 100644 --- a/runtime/locks.h +++ b/runtime/locks.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_LOCKS_H_ -#define ART_SRC_LOCKS_H_ +#ifndef ART_RUNTIME_LOCKS_H_ +#define ART_RUNTIME_LOCKS_H_ #include <ostream> @@ -165,4 +165,4 @@ class Locks { } // namespace art -#endif // ART_SRC_LOCKS_H_ +#endif // ART_RUNTIME_LOCKS_H_ diff --git a/runtime/log_severity.h b/runtime/log_severity.h index 126019bdb6..bb7679d218 100644 --- a/runtime/log_severity.h +++ b/runtime/log_severity.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef BASE_LOG_SEVERITY_H_ -#define BASE_LOG_SEVERITY_H_ +#ifndef ART_RUNTIME_LOG_SEVERITY_H_ +#define ART_RUNTIME_LOG_SEVERITY_H_ typedef int LogSeverity; const int VERBOSE = 0, DEBUG = 1, INFO = 2, WARNING = 3, ERROR = 4, FATAL = 5; const int INTERNAL_FATAL = 6; // For Runtime::Abort. -#endif // BASE_LOG_SEVERITY_H_ +#endif // ART_RUNTIME_LOG_SEVERITY_H_ diff --git a/runtime/mem_map.h b/runtime/mem_map.h index 2eb7772705..7d418a5c6a 100644 --- a/runtime/mem_map.h +++ b/runtime/mem_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MEM_MAP_H_ -#define ART_SRC_MEM_MAP_H_ +#ifndef ART_RUNTIME_MEM_MAP_H_ +#define ART_RUNTIME_MEM_MAP_H_ #include <string> @@ -101,4 +101,4 @@ class MemMap { } // namespace art -#endif // ART_SRC_MEM_MAP_H_ +#endif // ART_RUNTIME_MEM_MAP_H_ diff --git a/runtime/memory_region.h b/runtime/memory_region.h index cfbe42dddf..849ab1c420 100644 --- a/runtime/memory_region.h +++ b/runtime/memory_region.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MEMORY_REGION_H_ -#define ART_SRC_MEMORY_REGION_H_ +#ifndef ART_RUNTIME_MEMORY_REGION_H_ +#define ART_RUNTIME_MEMORY_REGION_H_ #include <stdint.h> @@ -96,4 +96,4 @@ class MemoryRegion { } // namespace art -#endif // ART_MEMORY_REGION_H_ +#endif // ART_RUNTIME_MEMORY_REGION_H_ diff --git a/runtime/method_reference.h b/runtime/method_reference.h index ff8bf313f0..1ff4ea0942 100644 --- a/runtime/method_reference.h +++ b/runtime/method_reference.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_METHOD_REFERENCE_H_ -#define ART_SRC_METHOD_REFERENCE_H_ +#ifndef ART_RUNTIME_METHOD_REFERENCE_H_ +#define ART_RUNTIME_METHOD_REFERENCE_H_ namespace art { @@ -44,4 +44,4 @@ struct MethodReferenceComparator { } // namespace art -#endif // ART_SRC_METHOD_REFERENCE_H_ +#endif // ART_RUNTIME_METHOD_REFERENCE_H_ diff --git a/runtime/mirror/abstract_method-inl.h b/runtime/mirror/abstract_method-inl.h index a8238867aa..6fcd705e55 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 339471dd5d..d909058e0d 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 b7f212f50f..eb73c7dd38 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 98b8ea0008..b195a87fc0 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 6819fb2954..d323c3333b 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 084aa24c7c..9a506c29af 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 0d635f1d21..415cb67c6c 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 3b17c428a5..369dc49ed0 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 307588b581..fd3f5f44b8 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 be5dcab03d..3e3d6db4a6 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 4e7abe8550..6e508a362f 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 72803b8002..9d5fa7475a 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 ffb2e51582..aea8fddafe 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 1a91dd3e6f..5818a800bf 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 71b628db52..a40c906eb0 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 b130dac514..8675c31b37 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 08a8d62567..09ff5193ae 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 cac028a731..7c5bc39429 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 d53c8602dc..a9751f9988 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 8109dcb9a9..bf545eaefb 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 aafcc07d86..909228e4d9 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_ diff --git a/runtime/modifiers.h b/runtime/modifiers.h index 85bc06da65..9b61ee0cf0 100644 --- a/runtime/modifiers.h +++ b/runtime/modifiers.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MODIFIERS_H_ -#define ART_SRC_MODIFIERS_H_ +#ifndef ART_RUNTIME_MODIFIERS_H_ +#define ART_RUNTIME_MODIFIERS_H_ #include <stdint.h> @@ -63,5 +63,5 @@ static const uint32_t kAccReferenceFlagsMask = (kAccClassIsReference | kAccClassIsFinalizerReference | kAccClassIsPhantomReference); -#endif // ART_SRC_MODIFIERS_H_ +#endif // ART_RUNTIME_MODIFIERS_H_ diff --git a/runtime/monitor.h b/runtime/monitor.h index 9194c08ab4..9206131a5b 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_MONITOR_H_ -#define ART_SRC_MONITOR_H_ +#ifndef ART_RUNTIME_MONITOR_H_ +#define ART_RUNTIME_MONITOR_H_ #include <pthread.h> #include <stdint.h> @@ -208,4 +208,4 @@ class MonitorInfo { } // namespace art -#endif // ART_SRC_MONITOR_H_ +#endif // ART_RUNTIME_MONITOR_H_ diff --git a/runtime/nth_caller_visitor.h b/runtime/nth_caller_visitor.h index c32a46aa02..e3593d805d 100644 --- a/runtime/nth_caller_visitor.h +++ b/runtime/nth_caller_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_NTH_CALLER_VISITOR_H_ -#define ART_SRC_NTH_CALLER_VISITOR_H_ +#ifndef ART_RUNTIME_NTH_CALLER_VISITOR_H_ +#define ART_RUNTIME_NTH_CALLER_VISITOR_H_ #include "mirror/abstract_method.h" #include "locks.h" @@ -58,4 +58,4 @@ struct NthCallerVisitor : public StackVisitor { } // namespace art -#endif // ART_SRC_NTH_CALLER_VISITOR_H_ +#endif // ART_RUNTIME_NTH_CALLER_VISITOR_H_ diff --git a/runtime/oat.h b/runtime/oat.h index c67a1a6630..fb28962762 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_H_ -#define ART_SRC_OAT_H_ +#ifndef ART_RUNTIME_OAT_H_ +#define ART_RUNTIME_OAT_H_ #include <vector> @@ -113,4 +113,4 @@ class PACKED(4) OatMethodOffsets { } // namespace art -#endif // ART_SRC_OAT_H_ +#endif // ART_RUNTIME_OAT_H_ diff --git a/runtime/oat/runtime/argument_visitor.h b/runtime/oat/runtime/argument_visitor.h index 4ab05b9e4d..d92ff19d13 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 @@ class QuickArgumentVisitor { } -#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 ec1d4cb7f6..0be85e3577 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 @@ class ArmContext : public Context { } // 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 dd2f3fa69e..59f46acbac 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 @@ static void FinishCalleeSaveFrameSetup(Thread* self, mirror::AbstractMethod** sp } // 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 895abf99ed..ac43e9a7e9 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 @@ class Context { } // 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 fc8ef9655f..f27124c79b 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 @@ class MipsContext : public Context { } // 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 c1a2587c45..546ee01c6f 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 @@ void ChangeDebuggerEntryPoint(EntryPoints* points, bool enabled); } // 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 7928fd860f..4ecfc51b04 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 @@ class X86Context : public Context { } // 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 06e0a55f63..b8c79d21b9 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 @@ class ArmExceptionSlowPath : public SlowPath { } // 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 b069f6dedd..01596bb6b1 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 @@ inline arm::ArmManagedRegister ManagedRegister::AsArm() const { } // 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 cbf145b949..05e2732c5f 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 @@ class Assembler { } // 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 a3d5795665..4dd2acd8fe 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 @@ class ManagedRegister { } // 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 02759e4efb..eeb4a57db2 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 @@ class MipsExceptionSlowPath : public SlowPath { } // 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 aaaabfcc0c..b335ff9649 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 @@ inline mips::MipsManagedRegister ManagedRegister::AsMips() const { } // 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 dddb9b1885..390f7aa898 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 @@ class X86ExceptionSlowPath : public SlowPath { } // 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 4481456315..b564a8396f 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 @@ inline x86::X86ManagedRegister ManagedRegister::AsX86() const { } // namespace art -#endif // ART_SRC_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ +#endif // ART_RUNTIME_OAT_UTILS_X86_MANAGED_REGISTER_X86_H_ diff --git a/runtime/oat_file.h b/runtime/oat_file.h index ecc8d0c965..fff6c8a1a6 100644 --- a/runtime/oat_file.h +++ b/runtime/oat_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OAT_FILE_H_ -#define ART_SRC_OAT_FILE_H_ +#ifndef ART_RUNTIME_OAT_FILE_H_ +#define ART_RUNTIME_OAT_FILE_H_ #include <string> #include <vector> @@ -265,4 +265,4 @@ class OatFile { } // namespace art -#endif // ART_SRC_OAT_WRITER_H_ +#endif // ART_RUNTIME_OAT_FILE_H_ diff --git a/runtime/object_utils.h b/runtime/object_utils.h index 4af5d4c30b..fa7763e11f 100644 --- a/runtime/object_utils.h +++ b/runtime/object_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OBJECT_UTILS_H_ -#define ART_SRC_OBJECT_UTILS_H_ +#ifndef ART_RUNTIME_OBJECT_UTILS_H_ +#define ART_RUNTIME_OBJECT_UTILS_H_ #include "class_linker-inl.h" #include "dex_file.h" @@ -684,4 +684,4 @@ class MethodHelper { } // namespace art -#endif // ART_SRC_OBJECT_UTILS_H_ +#endif // ART_RUNTIME_OBJECT_UTILS_H_ diff --git a/runtime/offsets.h b/runtime/offsets.h index f37dbd4413..94ae805e4a 100644 --- a/runtime/offsets.h +++ b/runtime/offsets.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OFFSETS_H_ -#define ART_SRC_OFFSETS_H_ +#ifndef ART_RUNTIME_OFFSETS_H_ +#define ART_RUNTIME_OFFSETS_H_ #include <iostream> // NOLINT #include "globals.h" @@ -59,4 +59,4 @@ class MemberOffset : public Offset { } // namespace art -#endif // ART_SRC_OFFSETS_H_ +#endif // ART_RUNTIME_OFFSETS_H_ diff --git a/runtime/os.h b/runtime/os.h index 3428b6afb3..6767566673 100644 --- a/runtime/os.h +++ b/runtime/os.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OS_H_ -#define ART_SRC_OS_H_ +#ifndef ART_RUNTIME_OS_H_ +#define ART_RUNTIME_OS_H_ namespace unix_file { class FdFile; @@ -41,4 +41,4 @@ class OS { } // namespace art -#endif // ART_SRC_OS_H_ +#endif // ART_RUNTIME_OS_H_ diff --git a/runtime/output_stream.h b/runtime/output_stream.h index b03092ddf7..d2a77d898e 100644 --- a/runtime/output_stream.h +++ b/runtime/output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_OUTPUT_STREAM_H_ -#define ART_SRC_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_OUTPUT_STREAM_H_ +#define ART_RUNTIME_OUTPUT_STREAM_H_ #include <stdint.h> @@ -53,4 +53,4 @@ class OutputStream { } // namespace art -#endif // ART_SRC_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_OUTPUT_STREAM_H_ diff --git a/runtime/primitive.h b/runtime/primitive.h index eaa04cd054..5e07311073 100644 --- a/runtime/primitive.h +++ b/runtime/primitive.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_PRIMITIVE_H_ -#define ART_SRC_PRIMITIVE_H_ +#ifndef ART_RUNTIME_PRIMITIVE_H_ +#define ART_RUNTIME_PRIMITIVE_H_ #include <sys/types.h> @@ -123,4 +123,4 @@ std::ostream& operator<<(std::ostream& os, const Primitive::Type& state); } // namespace art -#endif // ART_SRC_PRIMITIVE_H_ +#endif // ART_RUNTIME_PRIMITIVE_H_ diff --git a/runtime/reference_table.h b/runtime/reference_table.h index 5abb5c7b46..4b6b50e183 100644 --- a/runtime/reference_table.h +++ b/runtime/reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_REFERENCE_TABLE_H_ -#define ART_SRC_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_REFERENCE_TABLE_H_ +#define ART_RUNTIME_REFERENCE_TABLE_H_ #include <cstddef> #include <iosfwd> @@ -62,4 +62,4 @@ class ReferenceTable { } // namespace art -#endif // ART_SRC_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_REFERENCE_TABLE_H_ diff --git a/runtime/reflection.h b/runtime/reflection.h index e9f4e0893e..56ab4712db 100644 --- a/runtime/reflection.h +++ b/runtime/reflection.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_REFLECTION_H_ -#define ART_SRC_REFLECTION_H_ +#ifndef ART_RUNTIME_REFLECTION_H_ +#define ART_RUNTIME_REFLECTION_H_ #include "jni.h" #include "primitive.h" @@ -56,4 +56,4 @@ bool VerifyObjectInClass(mirror::Object* o, mirror::Class* c) } // namespace art -#endif // ART_SRC_REFLECTION_H_ +#endif // ART_RUNTIME_REFLECTION_H_ diff --git a/runtime/root_visitor.h b/runtime/root_visitor.h index d53acd3621..3aa9b4bac0 100644 --- a/runtime/root_visitor.h +++ b/runtime/root_visitor.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ROOT_VISITOR_H_ -#define ART_SRC_ROOT_VISITOR_H_ +#ifndef ART_RUNTIME_ROOT_VISITOR_H_ +#define ART_RUNTIME_ROOT_VISITOR_H_ namespace art { namespace mirror { @@ -30,4 +30,4 @@ typedef bool (IsMarkedTester)(const mirror::Object* object, void* arg); } // namespace art -#endif // ART_SRC_ROOT_VISITOR_H_ +#endif // ART_RUNTIME_ROOT_VISITOR_H_ diff --git a/runtime/runtime.h b/runtime/runtime.h index 97b7c2518b..58f985fae7 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_H_ -#define ART_SRC_RUNTIME_H_ +#ifndef ART_RUNTIME_RUNTIME_H_ +#define ART_RUNTIME_RUNTIME_H_ #include <jni.h> #include <stdio.h> @@ -476,4 +476,4 @@ class Runtime { } // namespace art -#endif // ART_SRC_RUNTIME_H_ +#endif // ART_RUNTIME_RUNTIME_H_ diff --git a/runtime/runtime_stats.h b/runtime/runtime_stats.h index 55e57ecc1d..05d3fbb60f 100644 --- a/runtime/runtime_stats.h +++ b/runtime/runtime_stats.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_STATS_H_ -#define ART_SRC_RUNTIME_STATS_H_ +#ifndef ART_RUNTIME_RUNTIME_STATS_H_ +#define ART_RUNTIME_RUNTIME_STATS_H_ #include <stdint.h> @@ -111,4 +111,4 @@ struct PACKED(4) RuntimeStats { } // namespace art -#endif // ART_SRC_HEAP_H_ +#endif // ART_RUNTIME_RUNTIME_STATS_H_ diff --git a/runtime/runtime_support.h b/runtime/runtime_support.h index 0cb82a5466..051981f99e 100644 --- a/runtime/runtime_support.h +++ b/runtime/runtime_support.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_RUNTIME_SUPPORT_H_ -#define ART_SRC_RUNTIME_SUPPORT_H_ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_H_ #include "class_linker.h" #include "common_throws.h" @@ -412,4 +412,4 @@ static inline void* GetJniDlsymLookupStub() { } // namespace art -#endif // ART_SRC_RUNTIME_SUPPORT_H_ +#endif // ART_RUNTIME_RUNTIME_SUPPORT_H_ diff --git a/runtime/runtime_support_llvm.h b/runtime/runtime_support_llvm.h index af99842089..566f7bcb16 100644 --- a/runtime/runtime_support_llvm.h +++ b/runtime/runtime_support_llvm.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ -#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ extern "C" { @@ -27,4 +27,4 @@ void* art_portable_find_runtime_support_func(void* context, const char* name); } // extern "C" -#endif // ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ +#endif // ART_RUNTIME_RUNTIME_SUPPORT_LLVM_H_ diff --git a/runtime/runtime_support_llvm_func_list.h b/runtime/runtime_support_llvm_func_list.h index a58b061e16..d371421a16 100644 --- a/runtime/runtime_support_llvm_func_list.h +++ b/runtime/runtime_support_llvm_func_list.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ +#define ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ + #define RUNTIME_SUPPORT_FUNC_LIST(V) \ V(LockObject, art_portable_lock_object_from_code) \ V(UnlockObject, art_portable_unlock_object_from_code) \ @@ -74,3 +77,6 @@ V(JniMethodEndSynchronized, art_portable_jni_method_end_synchronized) \ V(JniMethodEndWithReference, art_portable_jni_method_end_with_reference) \ V(JniMethodEndWithReferenceSynchronized, art_portable_jni_method_end_with_reference_synchronized) + +#endif // ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ +#undef ART_RUNTIME_RUNTIME_SUPPORT_LLVM_FUNC_LIST_H_ // the guard in this file is just for cpplint diff --git a/runtime/safe_map.h b/runtime/safe_map.h index b9a6ecf5e7..dcc172de01 100644 --- a/runtime/safe_map.h +++ b/runtime/safe_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SAFE_MAP_H_ -#define ART_SRC_SAFE_MAP_H_ +#ifndef ART_RUNTIME_SAFE_MAP_H_ +#define ART_RUNTIME_SAFE_MAP_H_ #include <map> @@ -102,4 +102,4 @@ bool operator!=(const SafeMap<K, V, Comparator>& lhs, const SafeMap<K, V, Compar } // namespace art -#endif // ART_SRC_SAFE_MAP_H_ +#endif // ART_RUNTIME_SAFE_MAP_H_ diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h index 81db2ecf60..2643f66c42 100644 --- a/runtime/scoped_thread_state_change.h +++ b/runtime/scoped_thread_state_change.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SCOPED_THREAD_STATE_CHANGE_H_ -#define ART_SRC_SCOPED_THREAD_STATE_CHANGE_H_ +#ifndef ART_RUNTIME_SCOPED_THREAD_STATE_CHANGE_H_ +#define ART_RUNTIME_SCOPED_THREAD_STATE_CHANGE_H_ #include "base/casts.h" #include "jni_internal.h" @@ -306,4 +306,4 @@ class ScopedObjectAccess : public ScopedObjectAccessUnchecked { } // namespace art -#endif // ART_SRC_SCOPED_THREAD_STATE_CHANGE_H_ +#endif // ART_RUNTIME_SCOPED_THREAD_STATE_CHANGE_H_ diff --git a/runtime/signal_catcher.h b/runtime/signal_catcher.h index de0220b11c..43bbef48ca 100644 --- a/runtime/signal_catcher.h +++ b/runtime/signal_catcher.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SIGNAL_CATCHER_H_ -#define ART_SRC_SIGNAL_CATCHER_H_ +#ifndef ART_RUNTIME_SIGNAL_CATCHER_H_ +#define ART_RUNTIME_SIGNAL_CATCHER_H_ #include "base/mutex.h" @@ -60,4 +60,4 @@ class SignalCatcher { } // namespace art -#endif // ART_SRC_SIGNAL_CATCHER_H_ +#endif // ART_RUNTIME_SIGNAL_CATCHER_H_ diff --git a/runtime/signal_set.h b/runtime/signal_set.h index d4aec86d1b..3b89e6e377 100644 --- a/runtime/signal_set.h +++ b/runtime/signal_set.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SIGNAL_SET_H_ -#define ART_SRC_SIGNAL_SET_H_ +#ifndef ART_RUNTIME_SIGNAL_SET_H_ +#define ART_RUNTIME_SIGNAL_SET_H_ #include <signal.h> @@ -59,4 +59,4 @@ class SignalSet { } // namespace art -#endif // ART_SRC_SIGNAL_SET_H_ +#endif // ART_RUNTIME_SIGNAL_SET_H_ diff --git a/runtime/sirt_ref.h b/runtime/sirt_ref.h index 12f8326347..81f0dff217 100644 --- a/runtime/sirt_ref.h +++ b/runtime/sirt_ref.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_SIRT_REF_H_ -#define ART_SRC_SIRT_REF_H_ +#ifndef ART_RUNTIME_SIRT_REF_H_ +#define ART_RUNTIME_SIRT_REF_H_ #include "base/logging.h" #include "base/macros.h" @@ -52,4 +52,4 @@ class SirtRef { } // namespace art -#endif // ART_SRC_SIRT_REF_H_ +#endif // ART_RUNTIME_SIRT_REF_H_ diff --git a/runtime/stack.h b/runtime/stack.h index fbfacb1733..0e2c4c5b86 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STACK_H_ -#define ART_SRC_STACK_H_ +#ifndef ART_RUNTIME_STACK_H_ +#define ART_RUNTIME_STACK_H_ #include "dex_file.h" #include "instrumentation.h" @@ -644,4 +644,4 @@ class VmapTable { } // namespace art -#endif // ART_SRC_STACK_H_ +#endif // ART_RUNTIME_STACK_H_ diff --git a/runtime/stack_indirect_reference_table.h b/runtime/stack_indirect_reference_table.h index dd106344de..4c9b038423 100644 --- a/runtime/stack_indirect_reference_table.h +++ b/runtime/stack_indirect_reference_table.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ -#define ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#ifndef ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ +#define ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ #include "base/logging.h" #include "base/macros.h" @@ -96,4 +96,4 @@ class StackIndirectReferenceTable { } // namespace art -#endif // ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#endif // ART_RUNTIME_STACK_INDIRECT_REFERENCE_TABLE_H_ diff --git a/runtime/strutil.h b/runtime/strutil.h index b8769183da..c8d39e2311 100644 --- a/runtime/strutil.h +++ b/runtime/strutil.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_STRUTIL_H_ -#define ART_SRC_STRUTIL_H_ +#ifndef ART_RUNTIME_STRUTIL_H_ +#define ART_RUNTIME_STRUTIL_H_ #include <string.h> @@ -37,4 +37,4 @@ struct CStringEq { } // namespace art -#endif // ART_SRC_STRUTIL_H_ +#endif // ART_RUNTIME_STRUTIL_H_ diff --git a/runtime/thread-inl.h b/runtime/thread-inl.h index 2fc5987306..c22f2cd921 100644 --- a/runtime/thread-inl.h +++ b/runtime/thread-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_INL_H_ -#define ART_SRC_THREAD_INL_H_ +#ifndef ART_RUNTIME_THREAD_INL_H_ +#define ART_RUNTIME_THREAD_INL_H_ #include "thread.h" @@ -133,4 +133,4 @@ inline void Thread::VerifyStack() { } // namespace art -#endif // ART_SRC_THREAD_INL_H_ +#endif // ART_RUNTIME_THREAD_INL_H_ diff --git a/runtime/thread.h b/runtime/thread.h index 0daf763359..64ff7c22fa 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_H_ -#define ART_SRC_THREAD_H_ +#ifndef ART_RUNTIME_THREAD_H_ +#define ART_RUNTIME_THREAD_H_ #include <pthread.h> @@ -788,4 +788,4 @@ std::ostream& operator<<(std::ostream& os, const ThreadState& state); } // namespace art -#endif // ART_SRC_THREAD_H_ +#endif // ART_RUNTIME_THREAD_H_ diff --git a/runtime/thread_list.h b/runtime/thread_list.h index 0470cfc3b9..87abbda479 100644 --- a/runtime/thread_list.h +++ b/runtime/thread_list.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_LIST_H_ -#define ART_SRC_THREAD_LIST_H_ +#ifndef ART_RUNTIME_THREAD_LIST_H_ +#define ART_RUNTIME_THREAD_LIST_H_ #include "base/mutex.h" #include "root_visitor.h" @@ -144,4 +144,4 @@ class ThreadList { } // namespace art -#endif // ART_SRC_THREAD_LIST_H_ +#endif // ART_RUNTIME_THREAD_LIST_H_ diff --git a/runtime/thread_pool.h b/runtime/thread_pool.h index 814e654ad7..3462d5efbb 100644 --- a/runtime/thread_pool.h +++ b/runtime/thread_pool.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_POOL_H_ -#define ART_SRC_THREAD_POOL_H_ +#ifndef ART_RUNTIME_THREAD_POOL_H_ +#define ART_RUNTIME_THREAD_POOL_H_ #include <deque> #include <vector> @@ -177,4 +177,4 @@ class WorkStealingThreadPool : public ThreadPool { } // namespace art -#endif // ART_SRC_THREAD_POOL_H_ +#endif // ART_RUNTIME_THREAD_POOL_H_ diff --git a/runtime/thread_state.h b/runtime/thread_state.h index 52f092efa0..fc4812a427 100644 --- a/runtime/thread_state.h +++ b/runtime/thread_state.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THREAD_STATE_H_ -#define ART_SRC_THREAD_STATE_H_ +#ifndef ART_RUNTIME_THREAD_STATE_H_ +#define ART_RUNTIME_THREAD_STATE_H_ namespace art { @@ -44,4 +44,4 @@ enum ThreadState { } // namespace art -#endif // ART_SRC_THREAD_STATE_H_ +#endif // ART_RUNTIME_THREAD_STATE_H_ diff --git a/runtime/throw_location.h b/runtime/throw_location.h index 8c1b9410af..b2cd4d5803 100644 --- a/runtime/throw_location.h +++ b/runtime/throw_location.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_THROW_LOCATION_H_ -#define ART_SRC_THROW_LOCATION_H_ +#ifndef ART_RUNTIME_THROW_LOCATION_H_ +#define ART_RUNTIME_THROW_LOCATION_H_ #include "base/macros.h" #include "root_visitor.h" @@ -75,4 +75,4 @@ class PACKED(4) ThrowLocation { } // namespace art -#endif // ART_SRC_THROW_LOCATION_H_ +#endif // ART_RUNTIME_THROW_LOCATION_H_ diff --git a/runtime/trace.h b/runtime/trace.h index 9432e718ff..5bd6a8d5ca 100644 --- a/runtime/trace.h +++ b/runtime/trace.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_TRACE_H_ -#define ART_SRC_TRACE_H_ +#ifndef ART_RUNTIME_TRACE_H_ +#define ART_RUNTIME_TRACE_H_ #include <ostream> #include <set> @@ -129,4 +129,4 @@ class Trace : public instrumentation::InstrumentationListener { } // namespace art -#endif // ART_SRC_TRACE_H_ +#endif // ART_RUNTIME_TRACE_H_ diff --git a/runtime/utf.h b/runtime/utf.h index 57c811f21d..4c9a1d959e 100644 --- a/runtime/utf.h +++ b/runtime/utf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTF_H_ -#define ART_SRC_UTF_H_ +#ifndef ART_RUNTIME_UTF_H_ +#define ART_RUNTIME_UTF_H_ #include "base/macros.h" @@ -94,4 +94,4 @@ uint16_t GetUtf16FromUtf8(const char** utf8_data_in); } // namespace art -#endif // ART_SRC_UTF_H_ +#endif // ART_RUNTIME_UTF_H_ diff --git a/runtime/utils.h b/runtime/utils.h index e5028bae86..a08e46524b 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_UTILS_H_ -#define ART_SRC_UTILS_H_ +#ifndef ART_RUNTIME_UTILS_H_ +#define ART_RUNTIME_UTILS_H_ #include <pthread.h> @@ -372,4 +372,4 @@ class VoidFunctor { } // namespace art -#endif // ART_SRC_UTILS_H_ +#endif // ART_RUNTIME_UTILS_H_ diff --git a/runtime/vector_output_stream.h b/runtime/vector_output_stream.h index 3546c8d577..7daa39ffa5 100644 --- a/runtime/vector_output_stream.h +++ b/runtime/vector_output_stream.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VECTOR_OUTPUT_STREAM_H_ -#define ART_SRC_VECTOR_OUTPUT_STREAM_H_ +#ifndef ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ +#define ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ #include "output_stream.h" @@ -62,4 +62,4 @@ class VectorOutputStream : public OutputStream { } // namespace art -#endif // ART_SRC_VECTOR_OUTPUT_STREAM_H_ +#endif // ART_RUNTIME_VECTOR_OUTPUT_STREAM_H_ diff --git a/runtime/verifier/dex_gc_map.h b/runtime/verifier/dex_gc_map.h index 673112b213..be7415e1d6 100644 --- a/runtime/verifier/dex_gc_map.h +++ b/runtime/verifier/dex_gc_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_DEX_GC_MAP_H_ -#define ART_SRC_VERIFIER_DEX_GC_MAP_H_ +#ifndef ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ +#define ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ #include <stdint.h> @@ -119,4 +119,4 @@ class DexPcToReferenceMap { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_DEX_GC_MAP_H_ +#endif // ART_RUNTIME_VERIFIER_DEX_GC_MAP_H_ diff --git a/runtime/verifier/instruction_flags.h b/runtime/verifier/instruction_flags.h index 9dc3ea7a7c..df89beecfb 100644 --- a/runtime/verifier/instruction_flags.h +++ b/runtime/verifier/instruction_flags.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ -#define ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ +#ifndef ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ +#define ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ #include "base/logging.h" @@ -113,4 +113,4 @@ class InstructionFlags { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_METHOD_INSTRUCTION_FLAGS_H_ +#endif // ART_RUNTIME_VERIFIER_INSTRUCTION_FLAGS_H_ diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h index ac0de9e1f7..57d630de5a 100644 --- a/runtime/verifier/method_verifier.h +++ b/runtime/verifier/method_verifier.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_METHOD_VERIFIER_H_ -#define ART_SRC_VERIFIER_METHOD_VERIFIER_H_ +#ifndef ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ +#define ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ #include <set> #include <vector> @@ -723,4 +723,4 @@ std::ostream& operator<<(std::ostream& os, const MethodVerifier::FailureKind& rh } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_METHOD_VERIFIER_H_ +#endif // ART_RUNTIME_VERIFIER_METHOD_VERIFIER_H_ diff --git a/runtime/verifier/reg_type.h b/runtime/verifier/reg_type.h index 9ac0ecac8a..1553f1e554 100644 --- a/runtime/verifier/reg_type.h +++ b/runtime/verifier/reg_type.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_H_ -#define ART_SRC_VERIFIER_REG_TYPE_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_H_ #include "base/macros.h" #include "globals.h" @@ -922,4 +922,4 @@ std::ostream& operator<<(std::ostream& os, const RegType& rhs) } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_H_ diff --git a/runtime/verifier/reg_type_cache-inl.h b/runtime/verifier/reg_type_cache-inl.h index 42474d1849..295e27198d 100644 --- a/runtime/verifier/reg_type_cache-inl.h +++ b/runtime/verifier/reg_type_cache-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ -#define ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ #include "reg_type.h" #include "reg_type_cache.h" @@ -43,4 +43,4 @@ inline const art::verifier::RegType& RegTypeCache::GetFromId(uint16_t id) const } } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_CACHE_INL_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_INL_H_ diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h index d70123c2de..814dff79f6 100644 --- a/runtime/verifier/reg_type_cache.h +++ b/runtime/verifier/reg_type_cache.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ -#define ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ +#ifndef ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ +#define ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ #include "base/casts.h" #include "base/macros.h" @@ -163,4 +163,4 @@ class RegTypeCache { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REG_TYPE_CACHE_H_ +#endif // ART_RUNTIME_VERIFIER_REG_TYPE_CACHE_H_ diff --git a/runtime/verifier/register_line-inl.h b/runtime/verifier/register_line-inl.h index 157e136cc1..b3a28470db 100644 --- a/runtime/verifier/register_line-inl.h +++ b/runtime/verifier/register_line-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ -#define ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ +#ifndef ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ +#define ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ #include "register_line.h" #include "method_verifier.h" @@ -32,4 +32,4 @@ inline const RegType& RegisterLine::GetRegisterType(uint32_t vsrc) const { } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REGISTER_LINE_INL_H_ +#endif // ART_RUNTIME_VERIFIER_REGISTER_LINE_INL_H_ diff --git a/runtime/verifier/register_line.h b/runtime/verifier/register_line.h index 5f17049e8e..cde7b9b0be 100644 --- a/runtime/verifier/register_line.h +++ b/runtime/verifier/register_line.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_VERIFIER_REGISTER_LINE_H_ -#define ART_SRC_VERIFIER_REGISTER_LINE_H_ +#ifndef ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ +#define ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ #include <deque> #include <vector> @@ -355,4 +355,4 @@ std::ostream& operator<<(std::ostream& os, const RegisterLine& rhs); } // namespace verifier } // namespace art -#endif // ART_SRC_VERIFIER_REGISTER_LINE_H_ +#endif // ART_RUNTIME_VERIFIER_REGISTER_LINE_H_ diff --git a/runtime/well_known_classes.h b/runtime/well_known_classes.h index 8170520d45..a8069bc9cb 100644 --- a/runtime/well_known_classes.h +++ b/runtime/well_known_classes.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_WELL_KNOWN_CLASSES_H_ -#define ART_SRC_WELL_KNOWN_CLASSES_H_ +#ifndef ART_RUNTIME_WELL_KNOWN_CLASSES_H_ +#define ART_RUNTIME_WELL_KNOWN_CLASSES_H_ #include "base/mutex.h" #include "jni.h" @@ -104,4 +104,4 @@ struct WellKnownClasses { } // namespace art -#endif // ART_SRC_WELL_KNOWN_CLASSES_H_ +#endif // ART_RUNTIME_WELL_KNOWN_CLASSES_H_ diff --git a/runtime/zip_archive.h b/runtime/zip_archive.h index ef3148696e..d648517aae 100644 --- a/runtime/zip_archive.h +++ b/runtime/zip_archive.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_SRC_ZIP_ARCHIVE_H_ -#define ART_SRC_ZIP_ARCHIVE_H_ +#ifndef ART_RUNTIME_ZIP_ARCHIVE_H_ +#define ART_RUNTIME_ZIP_ARCHIVE_H_ #include <stdint.h> #include <zlib.h> @@ -129,4 +129,4 @@ class ZipArchive { } // namespace art -#endif // ART_SRC_ZIP_ARCHIVE_H_ +#endif // ART_RUNTIME_ZIP_ARCHIVE_H_ diff --git a/tools/cpplint.py b/tools/cpplint.py index ff92d70f06..30c712856e 100755 --- a/tools/cpplint.py +++ b/tools/cpplint.py @@ -726,7 +726,11 @@ class FileInfo: os.path.exists(os.path.join(root_dir, ".hg")) or os.path.exists(os.path.join(root_dir, ".svn"))): prefix = os.path.commonprefix([root_dir, project_dir]) - return fullname[len(prefix) + 1:] + # BEGIN android-changed + # return fullname[len(prefix) + 1:] + return "art/" + fullname[len(prefix) + 1:] + # END android-changed + # Don't know what to do; header guard warnings may be wrong... return fullname @@ -1032,7 +1036,6 @@ def GetHeaderGuardCPPVariable(filename): # Restores original filename in case that cpplint is invoked from Emacs's # flymake. filename = re.sub(r'_flymake\.h$', '.h', filename) - fileinfo = FileInfo(filename) return re.sub(r'[-./\s]', '_', fileinfo.RepositoryName()).upper() + '_' |