commit 641ce0371c2f0dc95d26be02d8366124c8b66653
author Brian Carlstrom <bdc@google.com> Thu Jan 31 15:21:37 2013 -0800
committer Brian Carlstrom <bdc@google.com> Fri Feb 01 12:22:53 2013 -0800
tree 5c132a223a739e852849d6a0d1b9ffef4305dfc3
parent 6cbd384cb98c6619c73fe4f76ef40a34ac6f355d

Rename compiler_llvm CompilationUnit to LlvmCompilationUnit

Also fixed stray ART_TEST_CFLAGS to LOCAL_CFLAGS
Also fixed relative includes

Tried to change CompilationUnit to reference LlvmCompilationUnit, but
that causes issues because of the split libart-compiler
libart-compiler-llvm.

Change-Id: I7a490f339add6355a20c1cedae858ccf6967a6aa

src/compiler/codegen/x86/assemble_x86.cc

diff --git a/src/compiler/codegen/x86/assemble_x86.cc b/src/compiler/codegen/x86/assemble_x86.cc
index 2b33090..1fa2352 100644
--- a/src/compiler/codegen/x86/assemble_x86.cc
+++ b/src/compiler/codegen/x86/assemble_x86.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "x86_lir.h"
 #include "codegen_x86.h"
-#include "../codegen_util.h"
+#include "compiler/codegen/codegen_util.h"
+#include "x86_lir.h"
 
 namespace art {