From fc496d95dfeae2e96ef1f5b1718e86cccc9b5055 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 9 Jul 2013 15:24:16 +0000 Subject: [PATCH] Add root_path_android.cc to webrtc/test/Android.mk. 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 --- webrtc/test/Android.mk | 2 +- webrtc/test/testsupport/android/root_path_android.cc | 2 +- webrtc/test/testsupport/android/root_path_android_chromium.cc | 2 +- webrtc/test/testsupport/fileutils.cc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webrtc/test/Android.mk b/webrtc/test/Android.mk index 20af6f9f6..73dceea35 100644 --- a/webrtc/test/Android.mk +++ b/webrtc/test/Android.mk @@ -17,6 +17,7 @@ LOCAL_MODULE:= libwebrtc_test_support LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES:= \ + testsupport/android/root_path_android.cc \ testsupport/fileutils.cc \ testsupport/perf_test.cc @@ -36,4 +37,3 @@ ifndef NDK_ROOT include external/stlport/libstlport.mk endif include $(BUILD_STATIC_LIBRARY) - diff --git a/webrtc/test/testsupport/android/root_path_android.cc b/webrtc/test/testsupport/android/root_path_android.cc index b75a5cc38..6eca5f57a 100644 --- a/webrtc/test/testsupport/android/root_path_android.cc +++ b/webrtc/test/testsupport/android/root_path_android.cc @@ -14,7 +14,7 @@ namespace webrtc { namespace test { static const char* kRootDirName = "/sdcard/"; -std::string ProjectRoothPathAndroid() { +std::string ProjectRootPathAndroid() { return kRootDirName; } diff --git a/webrtc/test/testsupport/android/root_path_android_chromium.cc b/webrtc/test/testsupport/android/root_path_android_chromium.cc index 1db73aed7..f8e65f4fd 100644 --- a/webrtc/test/testsupport/android/root_path_android_chromium.cc +++ b/webrtc/test/testsupport/android/root_path_android_chromium.cc @@ -20,7 +20,7 @@ std::string OutputPathImpl(); // 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 // trunk/webrtc (in standalone) or src/third_party/webrtc (in Chromium). -std::string ProjectRoothPathAndroid() { +std::string ProjectRootPathAndroid() { base::FilePath root_path; base::android::GetExternalStorageDirectory(&root_path); return root_path.value() + "/"; diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc index 84945ffb5..d4354d80b 100644 --- a/webrtc/test/testsupport/fileutils.cc +++ b/webrtc/test/testsupport/fileutils.cc @@ -57,7 +57,7 @@ bool relative_dir_path_set = false; const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR"; std::string OutputPathAndroid(); -std::string ProjectRoothPathAndroid(); +std::string ProjectRootPathAndroid(); void SetExecutablePath(const std::string& path) { std::string working_dir = WorkingDir(); @@ -93,7 +93,7 @@ std::string OutputPathImpl() { #ifdef WEBRTC_ANDROID std::string ProjectRootPath() { - return ProjectRoothPathAndroid(); + return ProjectRootPathAndroid(); } std::string OutputPath() {