| Index: webrtc/test/testsupport/fileutils.cc
|
| diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
|
| index 8301e77165d2e1e2d4214db876b9d7fd413bb99e..c29e5024331b3123f9e7d159f9a1deafdd804261 100644
|
| --- a/webrtc/test/testsupport/fileutils.cc
|
| +++ b/webrtc/test/testsupport/fileutils.cc
|
| @@ -41,6 +41,11 @@
|
| namespace webrtc {
|
| namespace test {
|
|
|
| +#if defined(WEBRTC_IOS)
|
| +// Defined in iosfileutils.mm. No header file to discourage use elsewhere.
|
| +std::string IOSResourcePath(std::string name, std::string extension);
|
| +#endif
|
| +
|
| namespace {
|
|
|
| #ifdef WIN32
|
| @@ -57,7 +62,9 @@ const char* kProjectRootFileName = "DEPS";
|
| const char* kOutputDirName = "out";
|
| const char* kFallbackPath = "./";
|
| #endif
|
| +#if !defined(WEBRTC_IOS)
|
| const char* kResourcesDirName = "resources";
|
| +#endif
|
|
|
| char relative_dir_path[FILENAME_MAX];
|
| bool relative_dir_path_set = false;
|
| @@ -205,6 +212,9 @@ bool CreateDir(std::string directory_name) {
|
| }
|
|
|
| std::string ResourcePath(std::string name, std::string extension) {
|
| +#if defined(WEBRTC_IOS)
|
| + return IOSResourcePath(name, extension);
|
| +#else
|
| std::string platform = "win";
|
| #ifdef WEBRTC_LINUX
|
| platform = "linux";
|
| @@ -239,6 +249,7 @@ std::string ResourcePath(std::string name, std::string extension) {
|
|
|
| // Fall back on name without architecture or platform.
|
| return resources_path + name + "." + extension;
|
| +#endif // defined (WEBRTC_IOS)
|
| }
|
|
|
| size_t GetFileSize(std::string filename) {
|
|
|