commit a974baaa563da2a44d4ec9dc7506ce2bc8d9dfc0
author David Srbecky <dsrbecky@google.com> Wed Jun 08 14:58:39 2022 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 08 17:28:02 2022 +0000
tree f93359124e5f02a4bc063c7b5d2adbb0a9361346
parent 5009eb53b99130e0360f03b7799d803d3064e20e

Fix golem build.

Bug: 235228755
Test: ART_TARGET_LINUX=true m build-art-target-golem
Change-Id: Ib336497b21fde5eae9a7923a1c93266d90852b32

runtime/native_stack_dump.cc

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)

runtime/runtime.cc

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
 }