diff options
| author | David Sehr <sehr@google.com> | 2018-03-02 12:01:51 -0800 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2018-03-05 13:58:20 -0800 |
| commit | c431b9dc4b23cc950eb313695258df5d89f53b22 (patch) | |
| tree | 422273559c3ae52caff0c6b1cf1a62a8312f0e26 /profman | |
| parent | f46f46cf5bd32788d5252b7107628a66594a5e98 (diff) | |
| download | art-c431b9dc4b23cc950eb313695258df5d89f53b22.tar.gz art-c431b9dc4b23cc950eb313695258df5d89f53b22.tar.bz2 art-c431b9dc4b23cc950eb313695258df5d89f53b22.zip | |
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
Diffstat (limited to 'profman')
| -rw-r--r-- | profman/profile_assistant.cc | 2 | ||||
| -rw-r--r-- | profman/profile_assistant_test.cc | 2 | ||||
| -rw-r--r-- | profman/profman.cc | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/profman/profile_assistant.cc b/profman/profile_assistant.cc index a00b1fa5bd..b509fb4027 100644 --- a/profman/profile_assistant.cc +++ b/profman/profile_assistant.cc @@ -16,8 +16,8 @@ #include "profile_assistant.h" +#include "base/os.h" #include "base/unix_file/fd_file.h" -#include "os.h" namespace art { diff --git a/profman/profile_assistant_test.cc b/profman/profile_assistant_test.cc index 6359814615..9494f04a5a 100644 --- a/profman/profile_assistant_test.cc +++ b/profman/profile_assistant_test.cc @@ -19,6 +19,7 @@ #include "android-base/strings.h" #include "art_method-inl.h" #include "base/unix_file/fd_file.h" +#include "base/utils.h" #include "common_runtime_test.h" #include "dex/descriptors_names.h" #include "exec_utils.h" @@ -28,7 +29,6 @@ #include "obj_ptr-inl.h" #include "profile_assistant.h" #include "scoped_thread_state_change-inl.h" -#include "utils.h" namespace art { diff --git a/profman/profman.cc b/profman/profman.cc index 5551c34b60..d1cc56389a 100644 --- a/profman/profman.cc +++ b/profman/profman.cc @@ -34,10 +34,12 @@ #include "base/dumpable.h" #include "base/logging.h" // For InitLogging. +#include "base/mutex.h" #include "base/scoped_flock.h" #include "base/stringpiece.h" #include "base/time_utils.h" #include "base/unix_file/fd_file.h" +#include "base/utils.h" #include "boot_image_profile.h" #include "bytecode_utils.h" #include "dex/art_dex_file_loader.h" @@ -49,7 +51,6 @@ #include "profile_assistant.h" #include "runtime.h" #include "type_reference.h" -#include "utils.h" #include "zip_archive.h" namespace art { @@ -204,6 +205,7 @@ class ProfMan FINAL { original_argc = argc; original_argv = argv; + Locks::Init(); InitLogging(argv, Runtime::Abort); // Skip over the command name. |