Revert^2 "Switch to LLVM prebuilt tools for ART gtests"
It is also necessary to adjust the expected output of some tests.
This reverts commit ea54b823a3a02f65c865e11bbbccb327a273c039.
Bug: 147817558
Test: m test-art-host-gtest
Change-Id: Ib244e8b7d43d575299654397a47056f295ab4589
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index c6a593c..a087aa5 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -300,24 +300,8 @@
// Get prebuilt binary tool.
// The paths need to be updated when Android prebuilts update.
-std::string CommonArtTestImpl::GetAndroidTool(const char* name, InstructionSet isa) {
- std::string path = GetAndroidBuildTop() + "prebuilts/gcc/linux-x86/";
- switch (isa) {
- case InstructionSet::kX86:
- case InstructionSet::kX86_64:
- path += "host/x86_64-linux-glibc2.17-4.8/x86_64-linux/bin/";
- break;
- case InstructionSet::kArm:
- case InstructionSet::kThumb2:
- path += "arm/arm-linux-androideabi-4.9/arm-linux-androideabi/bin/";
- break;
- case InstructionSet::kArm64:
- path += "aarch64/aarch64-linux-android-4.9/aarch64-linux-android/bin/";
- break;
- default:
- LOG(FATAL) << "Unknown ISA: " << isa;
- break;
- }
+std::string CommonArtTestImpl::GetAndroidTool(const char* name, InstructionSet) {
+ std::string path = GetAndroidBuildTop() + "prebuilts/clang/host/linux-x86/clang-r383902b/bin/";
CHECK(OS::DirectoryExists(path.c_str())) << path;
path += name;
CHECK(OS::FileExists(path.c_str())) << path;