commit c607092fda93d8d9a52ec8ee2fddd6a685a6785a
author David Srbecky <dsrbecky@google.com> Thu Jul 16 11:06:32 2020 +0100
committer David Srbecky <dsrbecky@google.com> Thu Jul 16 17:05:50 2020 +0000
tree 5dbdc81dba0a3344fe4e633632adb018572d19dd
parent 3060bb919cd2f37c6a97e87c1581ac5294af72b3

Fix golem build

ART_CLANG_PATH is not defined (or needed) on golem.

Bug: 147817558
Test: m build-art-target-golem build-art-host-golem
Change-Id: I635b7b86fb8120954d206601590df42b505e87cf

libartbase/base/common_art_test.cc

diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index fd6da87..6c19138 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -301,9 +301,9 @@
 // Get prebuilt binary tool.
 // The paths need to be updated when Android prebuilts update.
 std::string CommonArtTestImpl::GetAndroidTool(const char* name, InstructionSet) {
-#ifdef ART_TARGET_ANDROID
+#ifndef ART_CLANG_PATH
   UNUSED(name);
-  LOG(FATAL) << "There are no prebuilt tools available when running on target.";
+  LOG(FATAL) << "There are no prebuilt tools available.";
   UNREACHABLE();
 #else
   std::string path = GetAndroidBuildTop() + ART_CLANG_PATH + "/bin/";

runtime/native_stack_dump.cc

diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index 4b2409b..6b6663a 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() {
-#ifndef ART_TARGET_ANDROID
+#ifdef ART_CLANG_PATH
   const char* env_value = getenv("ANDROID_BUILD_TOP");
   if (env_value != nullptr) {
     return std::string(env_value) + "/" + ART_CLANG_PATH + "/bin/llvm-addr2line";