Fix golem build.
Bug: 235228755
Test: ART_TARGET_LINUX=true m build-art-target-golem
Change-Id: Ib336497b21fde5eae9a7923a1c93266d90852b32
diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index 1f09f45..31deda1 100644
--- a/runtime/native_stack_dump.cc
+++ b/runtime/native_stack_dump.cc
@@ -69,7 +69,7 @@
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 1579900..e56d533 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1376,6 +1376,8 @@
}
}
return result;
+#else
+ return empty_apex_versions; // Not an Android build.
#endif
}