From 8f4b056427a9d2321e3aa4f21ca8ffb18b3e5ae6 Mon Sep 17 00:00:00 2001 From: David Sehr Date: Fri, 2 Mar 2018 12:01:51 -0800 Subject: Move most of runtime/base to libartbase/base Enforce the layering that code in runtime/base should not depend on runtime by separating it into libartbase. Some of the code in runtime/base depends on the Runtime class, so it cannot be moved yet. Also, some of the tests depend on CommonRuntimeTest, which itself needs to be factored (in a subsequent CL). Bug: 22322814 Test: make -j 50 checkbuild make -j 50 test-art-host Change-Id: I8b096c1e2542f829eb456b4b057c71421b77d7e2 Merged-In: c431b9dc4b23cc950eb313695258df5d89f53b22 (cherry picked from commit c431b9dc4b23cc950eb313695258df5d89f53b22) --- runtime/oat_file_assistant.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/oat_file_assistant.cc') diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index c96d8258f2..5888c37582 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -25,7 +25,9 @@ #include "base/file_utils.h" #include "base/logging.h" // For VLOG. +#include "base/os.h" #include "base/stl_util.h" +#include "base/utils.h" #include "class_linker.h" #include "compiler_filter.h" #include "dex/art_dex_file_loader.h" @@ -35,10 +37,8 @@ #include "gc/space/image_space.h" #include "image.h" #include "oat.h" -#include "os.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" -#include "utils.h" #include "vdex_file.h" #include "class_loader_context.h" -- cgit v1.2.3-59-g8ed1b