generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change file path to make it work on android

Browse Source 
BUG=
TEST=try bots
Review URL: https://webrtc-codereview.appspot.com/672007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2471 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-06-29 18:28:12 +00:00
parent 8d59e70434
commit fb59442c40
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/testsupport/fileutils.cc
View File

@ -39,7 +39,11 @@ static const char* kPathDelimiter = "/";
static const char* kProjectRootFileName = "DEPS"; static const char* kProjectRootFileName = "DEPS";
static const char* kOutputDirName = "out"; static const char* kOutputDirName = "out";
static const char* kFallbackPath = "./"; static const char* kFallbackPath = "./";
#ifdef WEBRTC_ANDROID
static const char* kResourcesDirName = "/sdcard/";
#else
static const char* kResourcesDirName = "resources"; static const char* kResourcesDirName = "resources";
#endif
const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR"; const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR";
std::string ProjectRootPath() { std::string ProjectRootPath() {
@ -142,6 +146,9 @@ std::string ResourcePath(std::string name, std::string extension) {
std::string architecture = "32"; std::string architecture = "32";
#endif // WEBRTC_ARCH_64_BITS #endif // WEBRTC_ARCH_64_BITS
#ifdef WEBRTC_ANDROID
std::string resources_path = kResourcesDirName;
#else
std::string resources_path = ProjectRootPath() + kResourcesDirName + std::string resources_path = ProjectRootPath() + kResourcesDirName +
kPathDelimiter; kPathDelimiter;
std::string resource_file = resources_path + name + "_" + platform + "_" + std::string resource_file = resources_path + name + "_" + platform + "_" +
@ -159,6 +166,7 @@ std::string ResourcePath(std::string name, std::string extension) {
if (FileExists(resource_file)) { if (FileExists(resource_file)) {
return resource_file; return resource_file;
} }
#endif
// Fall back on name without architecture or platform. // Fall back on name without architecture or platform.
return resources_path + name + "." + extension; return resources_path + name + "." + extension;
} }