commit bbf02afc641a393d33342976e269218668c07386
author David Srbecky <dsrbecky@google.com> Tue Apr 21 17:36:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 21 17:36:30 2015 +0000
tree 3521c48569beca86df31ecca96278d43ecfba739
parent 296c6cc2e5e90a81bdfc5f5486eae6b64d80e595
parent 0774307ddf064445c7ad3b1209ee5b6632d941ad

Merge "Do not look for prebuilts on architectures other than Arm."

runtime/prebuilt_tools_test.cc

diff --git a/runtime/prebuilt_tools_test.cc b/runtime/prebuilt_tools_test.cc
index 453c0da..53bc876 100644
--- a/runtime/prebuilt_tools_test.cc
+++ b/runtime/prebuilt_tools_test.cc
@@ -49,7 +49,8 @@
 }
 
 TEST_F(PrebuiltToolsTest, CheckTargetTools) {
-  InstructionSet isas[] = { kArm, kArm64, kThumb2, kX86, kX86_64, kMips, kMips64 };  // NOLINT
+  // Other prebuilts are missing from the build server's repo manifest.
+  InstructionSet isas[] = { kThumb2 };  // NOLINT
   for (InstructionSet isa : isas) {
     std::string tools_dir = GetAndroidTargetToolsDir(isa);
     if (tools_dir.empty()) {