diff options
| -rw-r--r-- | build/Android.oat.mk | 2 | ||||
| -rw-r--r-- | runtime/thread_list.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 8240ece586..4e8d1cc524 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -47,7 +47,7 @@ ifdef TARGET_2ND_ARCH 2ND_TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/core.art endif -HOST_CORE_IMG_LOCATION := $(realpath $(HOST_OUT_JAVA_LIBRARIES))/core.art +HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art TARGET_INSTRUCTION_SET_FEATURES := $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index 31d8d60f76..8046500c59 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -754,7 +754,7 @@ void ThreadList::Register(Thread* self) { if (VLOG_IS_ON(threads)) { std::ostringstream oss; self->ShortDump(oss); // We don't hold the mutator_lock_ yet and so cannot call Dump. - LOG(INFO) << "ThreadList::Register() " << *self << "\n" << oss; + LOG(INFO) << "ThreadList::Register() " << *self << "\n" << oss.str(); } // Atomically add self to the thread list and make its thread_suspend_count_ reflect ongoing |