commit 1979c64214bd505c013d573bc8729ee94f7bdea5
author David Sehr <sehr@google.com> Thu Apr 26 14:41:18 2018 -0700
committer David Sehr <sehr@google.com> Thu Apr 26 15:08:49 2018 -0700
tree 9b4b2298b8b9d15cd6ca0a1e06e3771f3db2163f
parent 5a87e19e4bf1b6719c2aad3effde1b38d2c3085c

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

tools/cpp-define-generator/constant_globals.def

diff --git a/tools/cpp-define-generator/constant_globals.def b/tools/cpp-define-generator/constant_globals.def
index 539633e..d0d6350 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)