diff options
| author | 2018-02-21 13:20:31 -0800 | |
|---|---|---|
| committer | 2018-02-21 13:51:15 -0800 | |
| commit | b2ec9f5c128673c43f776cbe12c8eeb0a6884ebb (patch) | |
| tree | 724022162a4f3de021cebab32ee5ac67ec860f32 /runtime/base/file_utils.cc | |
| parent | f13343eb8b2738e2812fd7bd9d5592f529e93c21 (diff) | |
Remove duplication, split tests
The code move to libdexfile/dex/descriptors_names.cc apparently did not
remove the original code from runtime/utils.cc. Fix that duplication
and all the header mentions needed. Also, split the test files to go
along with the new locations for the code to be tested.
Bug: 22322814
Test: make -j 50 checkbuild
make -j 50 test-art-host-gtest
flash & boot marlin
Change-Id: Ie734672c4bca2c647d8016291f910b5608674545
Diffstat (limited to 'runtime/base/file_utils.cc')
| -rw-r--r-- | runtime/base/file_utils.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/runtime/base/file_utils.cc b/runtime/base/file_utils.cc index 58990f344b..dd3f8d5b3c 100644 --- a/runtime/base/file_utils.cc +++ b/runtime/base/file_utils.cc @@ -45,15 +45,12 @@ #include "android-base/stringprintf.h" #include "android-base/strings.h" +#include "base/bit_utils.h" #include "base/stl_util.h" #include "base/unix_file/fd_file.h" -#include "dex/dex_file-inl.h" #include "dex/dex_file_loader.h" -#include "dex/dex_instruction.h" -#include "dex/utf-inl.h" -#include "oat_quick_method_header.h" +#include "globals.h" #include "os.h" -#include "scoped_thread_state_change-inl.h" #if defined(__APPLE__) #include <crt_externs.h> |