diff options
| author | 2018-04-27 15:49:58 +0000 | |
|---|---|---|
| committer | 2018-04-27 15:49:58 +0000 | |
| commit | 0ecbdb32eb0f829614c25a54a165f43c3ad676f8 (patch) | |
| tree | b0d2b2f52be1296be2536d9838efc29b32a80a04 /compiler/optimizing | |
| parent | 8404e930d2f74430e156c1f11c7ed2908b29ec2b (diff) | |
| parent | 1979c64214bd505c013d573bc8729ee94f7bdea5 (diff) | |
Merge "Clean up include paths"
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 62cacebaa1..f0c4ee01cc 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 d8cea30a6b..6ee9c70fdb 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 { |