From 3d95c31b360fb69c5d62fc50a85821a5f1f6acaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 27 Jul 2018 10:02:35 +0200 Subject: [PATCH] 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 Reviewed-by: Mirko Bonadei Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#24124} --- test/testsupport/fileutils.cc | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc index 7b4482a124..370ee06b29 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 @@ std::string ResourcePath(const std::string& name, 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) }