diff options
| author | 2018-03-01 16:28:05 +0000 | |
|---|---|---|
| committer | 2018-03-01 16:28:05 +0000 | |
| commit | 53c914c23d3a2ebd753172371c971cfe41baa79f (patch) | |
| tree | 89a2a66cb5d14cece8d265a18721b9d50ba27a60 /compiler/optimizing | |
| parent | fc8fa9ec55e8cba3f0078ffc7587389c2176e810 (diff) | |
| parent | 9847dc00c1f37653734efdc59d9b49af87379a3d (diff) | |
Merge "Header library to remove dependence on runtime/" am: 8a346fa6a8
am: 9847dc00c1
Change-Id: I5db32f857d57359502228c8fded8a2483e66edbc
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/data_type-inl.h | 2 | ||||
| -rw-r--r-- | compiler/optimizing/data_type_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 01155dcd37..ff59173c8b 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -43,6 +43,7 @@ #include "base/bit_utils.h" #include "base/bit_utils_iterator.h" #include "base/casts.h" +#include "base/leb128.h" #include "bytecode_utils.h" #include "class_linker.h" #include "compiled_method.h" @@ -52,7 +53,6 @@ #include "graph_visualizer.h" #include "intern_table.h" #include "intrinsics.h" -#include "leb128.h" #include "mirror/array-inl.h" #include "mirror/object_array-inl.h" #include "mirror/object_reference.h" diff --git a/compiler/optimizing/data_type-inl.h b/compiler/optimizing/data_type-inl.h index e2cf7a80fe..94807e8fc9 100644 --- a/compiler/optimizing/data_type-inl.h +++ b/compiler/optimizing/data_type-inl.h @@ -18,7 +18,7 @@ #define ART_COMPILER_OPTIMIZING_DATA_TYPE_INL_H_ #include "data_type.h" -#include "primitive.h" +#include "dex/primitive.h" namespace art { diff --git a/compiler/optimizing/data_type_test.cc b/compiler/optimizing/data_type_test.cc index ca137b7c7c..8fea22bce8 100644 --- a/compiler/optimizing/data_type_test.cc +++ b/compiler/optimizing/data_type_test.cc @@ -20,7 +20,7 @@ #include "base/array_ref.h" #include "base/macros.h" -#include "primitive.h" +#include "dex/primitive.h" namespace art { |