ART: Remove art and art/runtime include_dir directives
Remove some overly broad or unnecessary include directives. Fix up
code.
Test: mmma art
Change-Id: Ic2da319f39102d59566e780f3e15fe007a3c36d6
diff --git a/compiler/Android.bp b/compiler/Android.bp
index f11d256..d0b5192 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -314,6 +314,7 @@
srcs: ["common_compiler_test.cc"],
shared_libs: [
"libartd-compiler",
+ "libartd-disassembler",
"libart-runtime-gtest",
"libbase",
],
diff --git a/compiler/cfi_test.h b/compiler/cfi_test.h
index 5347e7f..866a4d5 100644
--- a/compiler/cfi_test.h
+++ b/compiler/cfi_test.h
@@ -26,7 +26,7 @@
#include "debug/dwarf/dwarf_constants.h"
#include "debug/dwarf/dwarf_test.h"
#include "debug/dwarf/headers.h"
-#include "disassembler/disassembler.h"
+#include "disassembler.h"
#include "gtest/gtest.h"
#include "thread.h"
diff --git a/compiler/dex/dex_to_dex_decompiler_test.cc b/compiler/dex/dex_to_dex_decompiler_test.cc
index 1ef3ba7..e36d416 100644
--- a/compiler/dex/dex_to_dex_decompiler_test.cc
+++ b/compiler/dex/dex_to_dex_decompiler_test.cc
@@ -17,12 +17,12 @@
#include "dex_to_dex_decompiler.h"
#include "class_linker.h"
-#include "compiler/common_compiler_test.h"
-#include "compiler/compiled_method.h"
-#include "compiler/driver/compiler_driver.h"
-#include "compiler/driver/compiler_options.h"
+#include "common_compiler_test.h"
+#include "compiled_method.h"
#include "compiler_callbacks.h"
#include "dex_file.h"
+#include "driver/compiler_driver.h"
+#include "driver/compiler_options.h"
#include "handle_scope-inl.h"
#include "mirror/class_loader.h"
#include "runtime.h"