diff options
| -rw-r--r-- | runtime/base/logging.cc | 2 | ||||
| -rw-r--r-- | runtime/oat_file.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc index 6b21a566ee..1dca4286da 100644 --- a/runtime/base/logging.cc +++ b/runtime/base/logging.cc @@ -80,7 +80,7 @@ void InitLogging(char* argv[], AbortFunction& abort_function) { gCmdLine.reset(new std::string("<unset>")); } -#ifdef __ANDROID__ +#ifdef ART_TARGET_ANDROID #define INIT_LOGGING_DEFAULT_LOGGER android::base::LogdLogger() #else #define INIT_LOGGING_DEFAULT_LOGGER android::base::StderrLogger diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index 404e5ce1cb..bdf8b0e65d 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -719,7 +719,7 @@ bool DlOpenOatFile::Dlopen(const std::string& elf_filename, dlopen_handle_ = android_dlopen_ext(absolute_path.get(), RTLD_NOW, &extinfo); #else UNUSED(oat_file_begin); - static_assert(!kIsTargetBuild, "host_dlopen_handles_ will leak handles"); + static_assert(!kIsTargetBuild || kIsTargetLinux, "host_dlopen_handles_ will leak handles"); MutexLock mu(Thread::Current(), *Locks::host_dlopen_handles_lock_); dlopen_handle_ = dlopen(absolute_path.get(), RTLD_NOW); if (dlopen_handle_ != nullptr) { diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 8a3bac77be..ee4d669fe0 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -2183,7 +2183,7 @@ void Runtime::RemoveSystemWeakHolder(gc::AbstractSystemWeakHolder* holder) { NO_RETURN void Runtime::Aborter(const char* abort_message) { -#ifdef __ANDROID__ +#ifdef ART_TARGET_ANDROID android_set_abort_message(abort_message); #endif Runtime::Abort(abort_message); |