diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 04:43:54 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 04:43:54 +0000 |
| commit | 4d0f93ca8cec419891f009d476f1525ccab56e54 (patch) | |
| tree | e1d948f4ef60216d351aef78aa259ba6ba8767e3 /base/process_util.h | |
| parent | 86e99b8b7da2a57d0cd8f238d7801a12dcdaee58 (diff) | |
| download | chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.zip chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.gz chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.bz2 | |
Upstream ProcessUtilTest, and make a few other files compile on Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8059007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
| -rw-r--r-- | base/process_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/process_util.h b/base/process_util.h index 574332f8..4cd1da3 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -164,7 +164,7 @@ BASE_EXPORT void CloseProcessHandle(ProcessHandle process); // Win XP SP1 as well. BASE_EXPORT ProcessId GetProcId(ProcessHandle process); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_ANDROID) // Returns the path to the executable of the given process. BASE_EXPORT FilePath GetProcessExecutablePath(ProcessHandle process); @@ -184,7 +184,7 @@ const int kMaxOomScore = 1000; // translate the given value into [0, 15]. Some aliasing of values // may occur in that case, of course. BASE_EXPORT bool AdjustOOMScore(ProcessId process, int score); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) #if defined(OS_POSIX) // Returns the ID for the parent of the given process. @@ -712,7 +712,7 @@ class BASE_EXPORT ProcessMetrics { DISALLOW_COPY_AND_ASSIGN(ProcessMetrics); }; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_ANDROID) // Data from /proc/meminfo about system-wide memory consumption. // Values are in KB. struct SystemMemoryInfoKB { @@ -730,7 +730,7 @@ struct SystemMemoryInfoKB { // Fills in the provided |meminfo| structure. Returns true on success. // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) // Returns the memory committed by the system in KBytes. // Returns 0 if it can't compute the commit charge. |