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
diff --git a/dex2oat/dex2oat_image_test.cc b/dex2oat/dex2oat_image_test.cc
index 05592f1..49b84bb 100644
--- a/dex2oat/dex2oat_image_test.cc
+++ b/dex2oat/dex2oat_image_test.cc
@@ -29,13 +29,13 @@
#include "base/file_utils.h"
#include "base/macros.h"
#include "base/unix_file/fd_file.h"
+#include "base/utils.h"
#include "dex/art_dex_file_loader.h"
#include "dex/dex_file-inl.h"
#include "dex/dex_file_loader.h"
#include "jit/profile_compilation_info.h"
#include "method_reference.h"
#include "runtime.h"
-#include "utils.h"
namespace art {
@@ -129,9 +129,9 @@
std::string art_file = scratch.GetFilename() + ".art";
std::string oat_file = scratch.GetFilename() + ".oat";
std::string vdex_file = scratch.GetFilename() + ".vdex";
- ret.art_size = GetFileSizeBytes(art_file);
- ret.oat_size = GetFileSizeBytes(oat_file);
- ret.vdex_size = GetFileSizeBytes(vdex_file);
+ ret.art_size = OS::GetFileSizeBytes(art_file.c_str());
+ ret.oat_size = OS::GetFileSizeBytes(oat_file.c_str());
+ ret.vdex_size = OS::GetFileSizeBytes(vdex_file.c_str());
CHECK_GT(ret.art_size, 0u) << art_file;
CHECK_GT(ret.oat_size, 0u) << oat_file;
CHECK_GT(ret.vdex_size, 0u) << vdex_file;