Clean up include paths
Remove runtime/globals.h and make clients point to the right globals.h
(libartbase/base/globals.h). Also make within-libartbase includes
relative rather than using base/, etc.
Bug: 22322814
Test: make -j 40 checkbuild
Change-Id: I99de63fc851d48946ab401e2369de944419041c7
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 05d8805..cdd9d4d 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -21,10 +21,10 @@
#include <string>
#include <vector>
+#include "base/globals.h"
#include "base/macros.h"
#include "base/utils.h"
#include "compiler_filter.h"
-#include "globals.h"
#include "optimizing/register_allocator.h"
namespace art {
diff --git a/compiler/linker/buffered_output_stream.h b/compiler/linker/buffered_output_stream.h
index 66994e8..512409c 100644
--- a/compiler/linker/buffered_output_stream.h
+++ b/compiler/linker/buffered_output_stream.h
@@ -21,7 +21,7 @@
#include "output_stream.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace linker {
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h
index 62caceb..f0c4ee0 100644
--- a/compiler/optimizing/code_generator.h
+++ b/compiler/optimizing/code_generator.h
@@ -25,10 +25,10 @@
#include "base/bit_field.h"
#include "base/bit_utils.h"
#include "base/enums.h"
+#include "base/globals.h"
#include "base/memory_region.h"
#include "dex/string_reference.h"
#include "dex/type_reference.h"
-#include "globals.h"
#include "graph_visualizer.h"
#include "locations.h"
#include "nodes.h"
diff --git a/compiler/optimizing/optimizing_compiler.h b/compiler/optimizing/optimizing_compiler.h
index d8cea30..6ee9c70 100644
--- a/compiler/optimizing/optimizing_compiler.h
+++ b/compiler/optimizing/optimizing_compiler.h
@@ -17,8 +17,8 @@
#ifndef ART_COMPILER_OPTIMIZING_OPTIMIZING_COMPILER_H_
#define ART_COMPILER_OPTIMIZING_OPTIMIZING_COMPILER_H_
+#include "base/globals.h"
#include "base/mutex.h"
-#include "globals.h"
namespace art {
diff --git a/compiler/utils/arm/constants_arm.h b/compiler/utils/arm/constants_arm.h
index 66252be..3e316c8 100644
--- a/compiler/utils/arm/constants_arm.h
+++ b/compiler/utils/arm/constants_arm.h
@@ -25,7 +25,7 @@
#include "arch/arm/registers_arm.h"
#include "base/casts.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace arm {
diff --git a/compiler/utils/arm/managed_register_arm.cc b/compiler/utils/arm/managed_register_arm.cc
index 1fdc110..deff658 100644
--- a/compiler/utils/arm/managed_register_arm.cc
+++ b/compiler/utils/arm/managed_register_arm.cc
@@ -16,7 +16,7 @@
#include "managed_register_arm.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace arm {
diff --git a/compiler/utils/arm/managed_register_arm_test.cc b/compiler/utils/arm/managed_register_arm_test.cc
index 43b0b51..6f440a7 100644
--- a/compiler/utils/arm/managed_register_arm_test.cc
+++ b/compiler/utils/arm/managed_register_arm_test.cc
@@ -15,7 +15,7 @@
*/
#include "managed_register_arm.h"
-#include "globals.h"
+#include "base/globals.h"
#include "gtest/gtest.h"
namespace art {
diff --git a/compiler/utils/arm64/managed_register_arm64.cc b/compiler/utils/arm64/managed_register_arm64.cc
index 47924bf..5632265 100644
--- a/compiler/utils/arm64/managed_register_arm64.cc
+++ b/compiler/utils/arm64/managed_register_arm64.cc
@@ -15,7 +15,7 @@
*/
#include "managed_register_arm64.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace arm64 {
diff --git a/compiler/utils/arm64/managed_register_arm64_test.cc b/compiler/utils/arm64/managed_register_arm64_test.cc
index 2a79313..d151ac9 100644
--- a/compiler/utils/arm64/managed_register_arm64_test.cc
+++ b/compiler/utils/arm64/managed_register_arm64_test.cc
@@ -17,7 +17,7 @@
#include "managed_register_arm64.h"
#include "assembler_arm64.h"
-#include "globals.h"
+#include "base/globals.h"
#include "gtest/gtest.h"
namespace art {
diff --git a/compiler/utils/assembler.cc b/compiler/utils/assembler.cc
index 421c1b6..d1d2a3d 100644
--- a/compiler/utils/assembler.cc
+++ b/compiler/utils/assembler.cc
@@ -20,8 +20,8 @@
#include <vector>
#include "base/casts.h"
+#include "base/globals.h"
#include "base/memory_region.h"
-#include "globals.h"
namespace art {
diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc
index 0c34aa4..5f405f3 100644
--- a/compiler/utils/jni_macro_assembler.cc
+++ b/compiler/utils/jni_macro_assembler.cc
@@ -38,8 +38,8 @@
#include "x86_64/jni_macro_assembler_x86_64.h"
#endif
#include "base/casts.h"
+#include "base/globals.h"
#include "base/memory_region.h"
-#include "globals.h"
namespace art {
diff --git a/compiler/utils/mips/assembler_mips.h b/compiler/utils/mips/assembler_mips.h
index c6ce62b..af3d7a0 100644
--- a/compiler/utils/mips/assembler_mips.h
+++ b/compiler/utils/mips/assembler_mips.h
@@ -24,10 +24,10 @@
#include "arch/mips/instruction_set_features_mips.h"
#include "base/arena_containers.h"
#include "base/enums.h"
+#include "base/globals.h"
#include "base/macros.h"
#include "base/stl_util_identity.h"
#include "constants_mips.h"
-#include "globals.h"
#include "heap_poisoning.h"
#include "managed_register_mips.h"
#include "offsets.h"
diff --git a/compiler/utils/mips/constants_mips.h b/compiler/utils/mips/constants_mips.h
index 016c0db..07d8b7d 100644
--- a/compiler/utils/mips/constants_mips.h
+++ b/compiler/utils/mips/constants_mips.h
@@ -22,8 +22,8 @@
#include <android-base/logging.h>
#include "arch/mips/registers_mips.h"
+#include "base/globals.h"
#include "base/macros.h"
-#include "globals.h"
namespace art {
namespace mips {
diff --git a/compiler/utils/mips/managed_register_mips.cc b/compiler/utils/mips/managed_register_mips.cc
index 5a8c048..9b3ed79 100644
--- a/compiler/utils/mips/managed_register_mips.cc
+++ b/compiler/utils/mips/managed_register_mips.cc
@@ -16,7 +16,7 @@
#include "managed_register_mips.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace mips {
diff --git a/compiler/utils/mips64/assembler_mips64.h b/compiler/utils/mips64/assembler_mips64.h
index 542dbaf..19f23b7 100644
--- a/compiler/utils/mips64/assembler_mips64.h
+++ b/compiler/utils/mips64/assembler_mips64.h
@@ -24,10 +24,10 @@
#include "arch/mips64/instruction_set_features_mips64.h"
#include "base/arena_containers.h"
#include "base/enums.h"
+#include "base/globals.h"
#include "base/macros.h"
#include "base/stl_util_identity.h"
#include "constants_mips64.h"
-#include "globals.h"
#include "heap_poisoning.h"
#include "managed_register_mips64.h"
#include "offsets.h"
diff --git a/compiler/utils/mips64/constants_mips64.h b/compiler/utils/mips64/constants_mips64.h
index 310f23c..41eb77c 100644
--- a/compiler/utils/mips64/constants_mips64.h
+++ b/compiler/utils/mips64/constants_mips64.h
@@ -22,8 +22,8 @@
#include <android-base/logging.h>
#include "arch/mips64/registers_mips64.h"
+#include "base/globals.h"
#include "base/macros.h"
-#include "globals.h"
namespace art {
namespace mips64 {
diff --git a/compiler/utils/mips64/managed_register_mips64.cc b/compiler/utils/mips64/managed_register_mips64.cc
index 42d061e..01cb6dd 100644
--- a/compiler/utils/mips64/managed_register_mips64.cc
+++ b/compiler/utils/mips64/managed_register_mips64.cc
@@ -16,7 +16,7 @@
#include "managed_register_mips64.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace mips64 {
diff --git a/compiler/utils/mips64/managed_register_mips64_test.cc b/compiler/utils/mips64/managed_register_mips64_test.cc
index 8b72d7e..bbfeeee 100644
--- a/compiler/utils/mips64/managed_register_mips64_test.cc
+++ b/compiler/utils/mips64/managed_register_mips64_test.cc
@@ -15,7 +15,8 @@
*/
#include "managed_register_mips64.h"
-#include "globals.h"
+
+#include "base/globals.h"
#include "gtest/gtest.h"
namespace art {
diff --git a/compiler/utils/x86/assembler_x86.h b/compiler/utils/x86/assembler_x86.h
index 22eaedc..e42c4c9 100644
--- a/compiler/utils/x86/assembler_x86.h
+++ b/compiler/utils/x86/assembler_x86.h
@@ -23,9 +23,9 @@
#include "base/array_ref.h"
#include "base/bit_utils.h"
#include "base/enums.h"
+#include "base/globals.h"
#include "base/macros.h"
#include "constants_x86.h"
-#include "globals.h"
#include "heap_poisoning.h"
#include "managed_register_x86.h"
#include "offsets.h"
diff --git a/compiler/utils/x86/constants_x86.h b/compiler/utils/x86/constants_x86.h
index 2e03b9f..73ef028 100644
--- a/compiler/utils/x86/constants_x86.h
+++ b/compiler/utils/x86/constants_x86.h
@@ -22,8 +22,8 @@
#include <android-base/logging.h>
#include "arch/x86/registers_x86.h"
+#include "base/globals.h"
#include "base/macros.h"
-#include "globals.h"
namespace art {
namespace x86 {
diff --git a/compiler/utils/x86/managed_register_x86.cc b/compiler/utils/x86/managed_register_x86.cc
index 69e6fce..cc7cedf 100644
--- a/compiler/utils/x86/managed_register_x86.cc
+++ b/compiler/utils/x86/managed_register_x86.cc
@@ -16,7 +16,7 @@
#include "managed_register_x86.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace x86 {
diff --git a/compiler/utils/x86/managed_register_x86_test.cc b/compiler/utils/x86/managed_register_x86_test.cc
index 0ed5c36..28af531 100644
--- a/compiler/utils/x86/managed_register_x86_test.cc
+++ b/compiler/utils/x86/managed_register_x86_test.cc
@@ -16,7 +16,7 @@
#include "managed_register_x86.h"
-#include "globals.h"
+#include "base/globals.h"
#include "gtest/gtest.h"
namespace art {
diff --git a/compiler/utils/x86_64/assembler_x86_64.h b/compiler/utils/x86_64/assembler_x86_64.h
index ab761fb..e4d72a7 100644
--- a/compiler/utils/x86_64/assembler_x86_64.h
+++ b/compiler/utils/x86_64/assembler_x86_64.h
@@ -22,9 +22,9 @@
#include "base/arena_containers.h"
#include "base/array_ref.h"
#include "base/bit_utils.h"
+#include "base/globals.h"
#include "base/macros.h"
#include "constants_x86_64.h"
-#include "globals.h"
#include "heap_poisoning.h"
#include "managed_register_x86_64.h"
#include "offsets.h"
diff --git a/compiler/utils/x86_64/constants_x86_64.h b/compiler/utils/x86_64/constants_x86_64.h
index 2af3e7b..b02e246 100644
--- a/compiler/utils/x86_64/constants_x86_64.h
+++ b/compiler/utils/x86_64/constants_x86_64.h
@@ -22,8 +22,8 @@
#include <android-base/logging.h>
#include "arch/x86_64/registers_x86_64.h"
+#include "base/globals.h"
#include "base/macros.h"
-#include "globals.h"
namespace art {
namespace x86_64 {
diff --git a/compiler/utils/x86_64/managed_register_x86_64.cc b/compiler/utils/x86_64/managed_register_x86_64.cc
index b8c2db2..c0eec9d 100644
--- a/compiler/utils/x86_64/managed_register_x86_64.cc
+++ b/compiler/utils/x86_64/managed_register_x86_64.cc
@@ -16,7 +16,7 @@
#include "managed_register_x86_64.h"
-#include "globals.h"
+#include "base/globals.h"
namespace art {
namespace x86_64 {
diff --git a/compiler/utils/x86_64/managed_register_x86_64_test.cc b/compiler/utils/x86_64/managed_register_x86_64_test.cc
index e43d717..46a405f 100644
--- a/compiler/utils/x86_64/managed_register_x86_64_test.cc
+++ b/compiler/utils/x86_64/managed_register_x86_64_test.cc
@@ -15,7 +15,7 @@
*/
#include "managed_register_x86_64.h"
-#include "globals.h"
+#include "base/globals.h"
#include "gtest/gtest.h"
namespace art {