diff options
| author | 2018-03-19 08:39:26 -0700 | |
|---|---|---|
| committer | 2018-03-19 11:02:48 -0700 | |
| commit | 312f3b2fd0094c028a7d243b116947a35a745806 (patch) | |
| tree | 3d7ec049ded98c489098c87250c75e3f711f8290 /compiler/linker | |
| parent | 0a3d5eb2ff9e70fa5785638da938439835d0337e (diff) | |
Move some remaining dex utilities
There were several utilities related to building/walking/testing dex
files that were not in libdexfile. This change consolidates these.
Bug: 22322814
Test: make -j 50 test-art-host
Change-Id: Id76e9179d03b8ec7d67f7e0f267121f54f0ec2e0
Diffstat (limited to 'compiler/linker')
| -rw-r--r-- | compiler/linker/arm/relative_patcher_arm_base.h | 2 | ||||
| -rw-r--r-- | compiler/linker/linker_patch.h | 2 | ||||
| -rw-r--r-- | compiler/linker/relative_patcher.h | 2 | ||||
| -rw-r--r-- | compiler/linker/relative_patcher_test.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/compiler/linker/arm/relative_patcher_arm_base.h b/compiler/linker/arm/relative_patcher_arm_base.h index b0064d1554..ee09bf96b3 100644 --- a/compiler/linker/arm/relative_patcher_arm_base.h +++ b/compiler/linker/arm/relative_patcher_arm_base.h @@ -21,8 +21,8 @@ #include <vector> #include "base/safe_map.h" +#include "dex/method_reference.h" #include "linker/relative_patcher.h" -#include "method_reference.h" namespace art { namespace linker { diff --git a/compiler/linker/linker_patch.h b/compiler/linker/linker_patch.h index 36051d2726..710d8a690a 100644 --- a/compiler/linker/linker_patch.h +++ b/compiler/linker/linker_patch.h @@ -23,7 +23,7 @@ #include <android-base/logging.h> #include "base/bit_utils.h" -#include "method_reference.h" +#include "dex/method_reference.h" namespace art { diff --git a/compiler/linker/relative_patcher.h b/compiler/linker/relative_patcher.h index 548e12896a..b58e3dffbd 100644 --- a/compiler/linker/relative_patcher.h +++ b/compiler/linker/relative_patcher.h @@ -23,7 +23,7 @@ #include "arch/instruction_set_features.h" #include "base/array_ref.h" #include "base/macros.h" -#include "method_reference.h" +#include "dex/method_reference.h" namespace art { diff --git a/compiler/linker/relative_patcher_test.h b/compiler/linker/relative_patcher_test.h index 9e9d14af9e..d21f2795b9 100644 --- a/compiler/linker/relative_patcher_test.h +++ b/compiler/linker/relative_patcher_test.h @@ -23,15 +23,15 @@ #include "base/macros.h" #include "compiled_method-inl.h" #include "dex/verification_results.h" +#include "dex/method_reference.h" +#include "dex/string_reference.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "globals.h" #include "gtest/gtest.h" #include "linker/relative_patcher.h" -#include "method_reference.h" #include "oat.h" #include "oat_quick_method_header.h" -#include "string_reference.h" #include "vector_output_stream.h" namespace art { |