diff options
author | 2018-04-26 14:41:18 -0700 | |
---|---|---|
committer | 2018-04-26 15:08:49 -0700 | |
commit | 1979c64214bd505c013d573bc8729ee94f7bdea5 (patch) | |
tree | 9b4b2298b8b9d15cd6ca0a1e06e3771f3db2163f /runtime/base/file_utils.cc | |
parent | 5a87e19e4bf1b6719c2aad3effde1b38d2c3085c (diff) |
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
Diffstat (limited to 'runtime/base/file_utils.cc')
-rw-r--r-- | runtime/base/file_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/base/file_utils.cc b/runtime/base/file_utils.cc index 7b0796cf37..7921985b15 100644 --- a/runtime/base/file_utils.cc +++ b/runtime/base/file_utils.cc @@ -43,11 +43,11 @@ #include "android-base/strings.h" #include "base/bit_utils.h" -#include "base/stl_util.h" +#include "base/globals.h" #include "base/os.h" +#include "base/stl_util.h" #include "base/unix_file/fd_file.h" #include "dex/dex_file_loader.h" -#include "globals.h" #if defined(__APPLE__) #include <crt_externs.h> |