Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Unified Diff: base/base_paths_android.cc

Issue 10802072: Fix android tree bustage (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base_paths_android.cc
===================================================================
--- base/base_paths_android.cc (revision 146154)
+++ base/base_paths_android.cc (working copy)
@@ -9,6 +9,7 @@
#include "base/android/jni_android.h"
#include "base/android/path_utils.h"
#include "base/file_path.h"
+#include "base/file_util.h"
#include "base/logging.h"
namespace {
@@ -32,30 +33,39 @@
*result = FilePath(bin_dir);
return true;
}
- case base::FILE_MODULE:
+ case base::FILE_MODULE: {
// dladdr didn't work in Android as only the file name was returned.
NOTIMPLEMENTED();
return false;
+ }
case base::DIR_MODULE: {
*result = FilePath(base::android::GetNativeLibraryDirectory());
return true;
}
- case base::DIR_SOURCE_ROOT:
+ case base::DIR_SOURCE_ROOT: {
// This const is only used for tests. Files in this directory are pushed
// to the device via test script.
*result = FilePath(FILE_PATH_LITERAL("/data/local/tmp/"));
return true;
- case base::DIR_CACHE:
+ }
+ case base::DIR_CACHE: {
*result = FilePath(base::android::GetCacheDirectory());
return true;
- case base::DIR_ANDROID_APP_DATA:
+ }
+ case base::DIR_ANDROID_APP_DATA: {
*result = FilePath(base::android::GetDataDirectory());
return true;
- default:
+ }
+ case base::DIR_HOME: {
+ *result = file_util::GetHomeDir();
+ return true;
+ }
+ default: {
// Note: the path system expects this function to override the default
// behavior. So no need to log an error if we don't support a given
// path. The system will just use the default.
return false;
+ }
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698