commit 3d95c31b360fb69c5d62fc50a85821a5f1f6acaf
author Niels Möller <nisse@webrtc.org> Fri Jul 27 10:02:35 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Jul 27 08:44:06 2018 +0000
tree 10db3f2f04613c5d7c4a20a2a3ca8e1c947f058c
parent 010955e1792bc6189d3dd1c5815b58f2a995f387

Delete logic to look for arch-specific resource files.

TBR: phoglund@webrtc.org
Bug: None
Change-Id: Icfa7025654299bd6776eb19204115fb06935a654
Reviewed-on: https://webrtc-review.googlesource.com/90860
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24124}

test/testsupport/fileutils.cc

diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc
index 7b4482a..370ee06 100644
--- a/test/testsupport/fileutils.cc
+++ b/test/testsupport/fileutils.cc
@@ -44,7 +44,6 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/stringutils.h"
-#include "rtc_base/system/arch.h"
 
 namespace webrtc {
 namespace test {
@@ -326,31 +325,14 @@
   platform = "android";
 #endif  // WEBRTC_ANDROID
 
-#ifdef WEBRTC_ARCH_64_BITS
-  std::string architecture = "64";
-#else
-  std::string architecture = "32";
-#endif  // WEBRTC_ARCH_64_BITS
-
   std::string resources_path =
       ProjectRootPath() + kResourcesDirName + kPathDelimiter;
-  std::string resource_file = resources_path + name + "_" + platform + "_" +
-                              architecture + "." + extension;
+  std::string resource_file =
+      resources_path + name + "_" + platform + "." + extension;
   if (FileExists(resource_file)) {
     return resource_file;
   }
-  // Try without architecture.
-  resource_file = resources_path + name + "_" + platform + "." + extension;
-  if (FileExists(resource_file)) {
-    return resource_file;
-  }
-  // Try without platform.
-  resource_file = resources_path + name + "_" + architecture + "." + extension;
-  if (FileExists(resource_file)) {
-    return resource_file;
-  }
-
-  // Fall back on name without architecture or platform.
+  // Fall back on name without platform.
   return resources_path + name + "." + extension;
 #endif  // defined (WEBRTC_IOS)
 }