From 1979c64214bd505c013d573bc8729ee94f7bdea5 Mon Sep 17 00:00:00 2001
From: David Sehr <sehr@google.com>
Date: Thu, 26 Apr 2018 14:41:18 -0700
Subject: 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
---
 compiler/utils/jni_macro_assembler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/utils/jni_macro_assembler.cc')

diff --git a/compiler/utils/jni_macro_assembler.cc b/compiler/utils/jni_macro_assembler.cc
index 0c34aa4f1d..5f405f348c 100644
--- a/compiler/utils/jni_macro_assembler.cc
+++ b/compiler/utils/jni_macro_assembler.cc
@@ -38,8 +38,8 @@
 #include "x86_64/jni_macro_assembler_x86_64.h"
 #endif
 #include "base/casts.h"
+#include "base/globals.h"
 #include "base/memory_region.h"
-#include "globals.h"
 
 namespace art {
 
-- 
cgit v1.2.3-59-g8ed1b