diff options
author | Ian Rogers <irogers@google.com> | 2014-10-22 22:06:39 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-10-22 22:21:57 -0700 |
commit | cf7f19135f0e273f7b0136315633c2abfc715343 (patch) | |
tree | ffa4d9efd9c45f4b6789acc1f534bb9327052b7e /dex2oat | |
parent | aea6888b056be21adf762e066c7f33b8939b8a06 (diff) | |
download | art-cf7f19135f0e273f7b0136315633c2abfc715343.zip art-cf7f19135f0e273f7b0136315633c2abfc715343.tar.gz art-cf7f19135f0e273f7b0136315633c2abfc715343.tar.bz2 |
C++11 related clean-up of DISALLOW_..
Move DISALLOW_COPY_AND_ASSIGN to delete functions. By no having declarations
with no definitions this prompts better warning messages so deal with these
by correcting the code.
Add a DISALLOW_ALLOCATION and use for ValueObject and mirror::Object.
Make X86 assembly operand types ValueObjects to fix compilation errors.
Tidy the use of iostream and ostream.
Avoid making cutils a dependency via mutex-inl.h for tests that link against
libart. Push tracing dependencies into appropriate files and mutex.cc.
x86 32-bit host symbols size is increased for libarttest, avoid copying this
in run-test 115 by using symlinks and remove this test's higher than normal
ulimit.
Fix the RunningOnValgrind test in RosAllocSpace to not use GetHeap as it
returns NULL when the heap is under construction by Runtime.
Change-Id: Ia246f7ac0c11f73072b30d70566a196e9b78472b
Diffstat (limited to 'dex2oat')
-rw-r--r-- | dex2oat/dex2oat.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 9777740..98712cd 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -30,6 +30,9 @@ #include <sys/utsname.h> #endif +#define ATRACE_TAG ATRACE_TAG_DALVIK +#include "cutils/trace.h" + #include "base/dumpable.h" #include "base/stl_util.h" #include "base/stringpiece.h" @@ -1238,8 +1241,7 @@ static int dex2oat(int argc, char** argv) { #ifdef ART_SEA_IR_MODE true, #endif - verbose_methods.empty() ? nullptr : &verbose_methods - )); // NOLINT(whitespace/parens) + verbose_methods.empty() ? nullptr : &verbose_methods)); // Done with usage checks, enable watchdog if requested WatchDog watch_dog(watch_dog_enabled); |