admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete logic to look for arch-specific resource files.

Browse Source 
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}
This commit is contained in:
Niels Möller 2018-07-27 10:02:35 +02:00 committed by Commit Bot
parent 010955e179
commit 3d95c31b36
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/testsupport/fileutils.cc
View File

@ -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)
}