diff options
| author | David Sehr <sehr@google.com> | 2018-04-26 14:41:18 -0700 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2018-04-26 15:08:49 -0700 |
| commit | 1979c64214bd505c013d573bc8729ee94f7bdea5 (patch) | |
| tree | 9b4b2298b8b9d15cd6ca0a1e06e3771f3db2163f /tools/cpp-define-generator | |
| parent | 5a87e19e4bf1b6719c2aad3effde1b38d2c3085c (diff) | |
| download | art-1979c64214bd505c013d573bc8729ee94f7bdea5.tar.gz art-1979c64214bd505c013d573bc8729ee94f7bdea5.tar.bz2 art-1979c64214bd505c013d573bc8729ee94f7bdea5.zip | |
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 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/constant_globals.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/cpp-define-generator/constant_globals.def b/tools/cpp-define-generator/constant_globals.def index 539633e0b3..d0d6350f80 100644 --- a/tools/cpp-define-generator/constant_globals.def +++ b/tools/cpp-define-generator/constant_globals.def @@ -18,8 +18,8 @@ #if defined(DEFINE_INCLUDE_DEPENDENCIES) #include <atomic> // std::memory_order_relaxed +#include "base/globals.h" // art::kObjectAlignment #include "dex/modifiers.h" -#include "globals.h" // art::kObjectAlignment #endif DEFINE_EXPR(STD_MEMORY_ORDER_RELAXED, int32_t, std::memory_order_relaxed) |