diff options
| -rw-r--r-- | runtime/native_stack_dump.cc | 2 | ||||
| -rw-r--r-- | runtime/runtime.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc index 1f09f45a5c..31deda10b6 100644 --- a/runtime/native_stack_dump.cc +++ b/runtime/native_stack_dump.cc @@ -69,7 +69,7 @@ using android::base::StringPrintf; static constexpr bool kUseAddr2line = !kIsTargetBuild; std::string FindAddr2line() { -#if !defined(ART_TARGET_ANDROID) and !defined(ART_CLANG_PATH) +#if !defined(ART_TARGET) && !defined(ART_CLANG_PATH) #error "ART_CLANG_PATH must be defined on host build" #endif #if defined(ART_CLANG_PATH) diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 1579900a45..e56d533d7d 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -1376,6 +1376,8 @@ std::string Runtime::GetApexVersions(ArrayRef<const std::string> boot_class_path } } return result; +#else + return empty_apex_versions; // Not an Android build. #endif } |