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

11 files changed, 38 insertions, 46 deletions

diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc
index 3c4f376753..34aea55f5b 100644
--- a/cmdline/cmdline_parser_test.cc
+++ b/cmdline/cmdline_parser_test.cc
@@ -20,10 +20,10 @@
 
 #include "gtest/gtest.h"
 
-#include "runtime/experimental_flags.h"
-#include "runtime/parsed_options.h"
-#include "runtime/runtime.h"
-#include "runtime/runtime_options.h"
+#include "experimental_flags.h"
+#include "parsed_options.h"
+#include "runtime.h"
+#include "runtime_options.h"
 #include "utils.h"
 
 #define EXPECT_NULL(expected) EXPECT_EQ(reinterpret_cast<const void*>(expected), \
diff --git a/compiler/Android.bp b/compiler/Android.bp
index f11d25675c..d0b519240e 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -314,6 +314,7 @@ art_cc_library {
     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 5347e7fef3..866a4d57a7 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 1ef3ba7c00..e36d416e9f 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"
diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index ab645bb94d..09bbbda6a7 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -25,7 +25,6 @@ art_cc_binary {
         "-Werror",
         "-Wextra",
     ],
-    include_dirs: ["art/runtime"],
     shared_libs: [
         "libnativehelper",
     ],
diff --git a/dexdump/dexdump_test.cc b/dexdump/dexdump_test.cc
index b8b65d662b..559dc8e781 100644
--- a/dexdump/dexdump_test.cc
+++ b/dexdump/dexdump_test.cc
@@ -21,11 +21,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "arch/instruction_set.h"
 #include "common_runtime_test.h"
-#include "runtime/arch/instruction_set.h"
-#include "runtime/exec_utils.h"
-#include "runtime/os.h"
-#include "runtime/utils.h"
+#include "exec_utils.h"
+#include "os.h"
 #include "utils.h"
 
 namespace art {
diff --git a/dexlayout/dexdiag_test.cc b/dexlayout/dexdiag_test.cc
index a0b3f32756..6fcd6ffe9f 100644
--- a/dexlayout/dexdiag_test.cc
+++ b/dexlayout/dexdiag_test.cc
@@ -19,9 +19,9 @@
 
 #include "common_runtime_test.h"
 
-#include "runtime/exec_utils.h"
-#include "runtime/oat_file.h"
-#include "runtime/os.h"
+#include "exec_utils.h"
+#include "oat_file.h"
+#include "os.h"
 
 namespace art {
 
diff --git a/dexlist/dexlist_test.cc b/dexlist/dexlist_test.cc
index f645f878d1..ae44848461 100644
--- a/dexlist/dexlist_test.cc
+++ b/dexlist/dexlist_test.cc
@@ -21,13 +21,12 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "arch/instruction_set.h"
 #include "common_runtime_test.h"
-#include "runtime/arch/instruction_set.h"
-#include "runtime/exec_utils.h"
-#include "runtime/gc/heap.h"
-#include "runtime/gc/space/image_space.h"
-#include "runtime/os.h"
-#include "runtime/utils.h"
+#include "exec_utils.h"
+#include "gc/heap.h"
+#include "gc/space/image_space.h"
+#include "os.h"
 #include "utils.h"
 
 namespace art {
diff --git a/imgdiag/imgdiag_test.cc b/imgdiag/imgdiag_test.cc
index 3245795132..80b0c26b7f 100644
--- a/imgdiag/imgdiag_test.cc
+++ b/imgdiag/imgdiag_test.cc
@@ -14,24 +14,23 @@
  * limitations under the License.
  */
 
+#include <sys/types.h>
+#include <unistd.h>
+
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "common_runtime_test.h"
-
 #include "android-base/stringprintf.h"
 
-#include "runtime/arch/instruction_set.h"
-#include "runtime/exec_utils.h"
-#include "runtime/gc/heap.h"
-#include "runtime/gc/space/image_space.h"
-#include "runtime/os.h"
-#include "runtime/runtime.h"
-#include "runtime/utils.h"
-
-#include <sys/types.h>
-#include <unistd.h>
+#include "arch/instruction_set.h"
+#include "common_runtime_test.h"
+#include "exec_utils.h"
+#include "gc/heap.h"
+#include "gc/space/image_space.h"
+#include "os.h"
+#include "runtime.h"
+#include "utils.h"
 
 namespace art {
 
diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h
index 48e9eb5964..1d5c536932 100644
--- a/oatdump/oatdump_test.h
+++ b/oatdump/oatdump_test.h
@@ -23,15 +23,13 @@
 
 #include "android-base/strings.h"
 
-#include "common_runtime_test.h"
-
+#include "arch/instruction_set.h"
 #include "base/unix_file/fd_file.h"
-#include "runtime/arch/instruction_set.h"
-#include "runtime/exec_utils.h"
-#include "runtime/gc/heap.h"
-#include "runtime/gc/space/image_space.h"
-#include "runtime/os.h"
-#include "runtime/utils.h"
+#include "common_runtime_test.h"
+#include "exec_utils.h"
+#include "gc/heap.h"
+#include "gc/space/image_space.h"
+#include "os.h"
 #include "utils.h"
 
 #include <sys/types.h>
diff --git a/test/Android.bp b/test/Android.bp
index 26b9b84ca5..f6f36c852e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -71,9 +71,6 @@ art_cc_defaults {
     whole_static_libs: [
         "libsigchain",
     ],
-    include_dirs: [
-        "art",
-    ],
 
     target: {
         linux: {