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

Add root_path_android.cc to webrtc/test/Android.mk.

Browse Source 
Fixes the broken android-platform build (build that uses .mk files).

TBR=andrew@webrtc.org,henrike@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/1777004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4314 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-07-09 15:24:16 +00:00
parent f3f1358360
commit fc496d95df
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/test/Android.mk
View File

@ -17,6 +17,7 @@ LOCAL_MODULE:= libwebrtc_test_support
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
testsupport/android/root_path_android.cc \
testsupport/fileutils.cc \ testsupport/fileutils.cc \
testsupport/perf_test.cc testsupport/perf_test.cc
@ -36,4 +37,3 @@ ifndef NDK_ROOT
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
webrtc/test/testsupport/android/root_path_android.cc
View File

@ -14,7 +14,7 @@ namespace webrtc {
namespace test { namespace test {
static const char* kRootDirName = "/sdcard/"; static const char* kRootDirName = "/sdcard/";
std::string ProjectRoothPathAndroid() { std::string ProjectRootPathAndroid() {
return kRootDirName; return kRootDirName;
} }

2
webrtc/test/testsupport/android/root_path_android_chromium.cc
View File

@ -20,7 +20,7 @@ std::string OutputPathImpl();
// The Android testing framework will push files relative to the root path of // The Android testing framework will push files relative to the root path of
// the Chromium workspace. The root path for webrtc is one directory up from // the Chromium workspace. The root path for webrtc is one directory up from
// trunk/webrtc (in standalone) or src/third_party/webrtc (in Chromium). // trunk/webrtc (in standalone) or src/third_party/webrtc (in Chromium).
std::string ProjectRoothPathAndroid() { std::string ProjectRootPathAndroid() {
base::FilePath root_path; base::FilePath root_path;
base::android::GetExternalStorageDirectory(&root_path); base::android::GetExternalStorageDirectory(&root_path);
return root_path.value() + "/"; return root_path.value() + "/";

4
webrtc/test/testsupport/fileutils.cc
View File

@ -57,7 +57,7 @@ bool relative_dir_path_set = false;
const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR"; const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR";
std::string OutputPathAndroid(); std::string OutputPathAndroid();
std::string ProjectRoothPathAndroid(); std::string ProjectRootPathAndroid();
void SetExecutablePath(const std::string& path) { void SetExecutablePath(const std::string& path) {
std::string working_dir = WorkingDir(); std::string working_dir = WorkingDir();
@ -93,7 +93,7 @@ std::string OutputPathImpl() {
#ifdef WEBRTC_ANDROID #ifdef WEBRTC_ANDROID
std::string ProjectRootPath() { std::string ProjectRootPath() {
return ProjectRoothPathAndroid(); return ProjectRootPathAndroid();
} }
std::string OutputPath() { std::string OutputPath() {