diff options
| author | 2017-12-08 23:40:10 +0000 | |
|---|---|---|
| committer | 2017-12-08 23:40:10 +0000 | |
| commit | db97032b3849762db5fecf191c1f3b9fc1386483 (patch) | |
| tree | 3fc8a567e2c8157c54e9e59639ec12fdd0c3306a /compiler | |
| parent | f279b82ef8b8bd766ddcd23e68130e11c04be67d (diff) | |
| parent | c654816053ae07fb1f129d705e94b76e59f37454 (diff) | |
Merge "ART: Change SCOPED_TRACE implementation"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Android.bp | 7 | ||||
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index 37a18cb9e9..fc19b54131 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -181,15 +181,10 @@ art_cc_defaults { ], }, }, - target: { - android: { - // For atrace. - shared_libs: ["libcutils"], - }, - }, generated_sources: ["art_compiler_operator_srcs"], shared_libs: [ "libbase", + "libcutils", // for atrace. "liblzma", ], include_dirs: ["art/disassembler"], diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 74603c668f..88e3e5b230 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -23,6 +23,7 @@ #include "art_method-inl.h" #include "base/logging.h" // For VLOG #include "base/stringpiece.h" +#include "base/systrace.h" #include "base/time_utils.h" #include "base/timing_logger.h" #include "base/unix_file/fd_file.h" @@ -163,6 +164,8 @@ JitCompiler::~JitCompiler() { } bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool osr) { + SCOPED_TRACE << "JIT compiling " << method->PrettyMethod(); + DCHECK(!method->IsProxyMethod()); DCHECK(method->GetDeclaringClass()->IsResolved()); |