summaryrefslogtreecommitdiffstats
path: root/base/time/time.h
diff options
context:
space:
mode:
authorfmeawad@chromium.org <fmeawad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 06:12:38 +0000
committerfmeawad@chromium.org <fmeawad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 06:12:38 +0000
commitef8bd2c73cd3b3dcadfa01348672b40900d01d42 (patch)
treebb755de799e9384f973fdd1206ec814ec08fa13d /base/time/time.h
parent069dd53daafcb090a01b570896e5c8eaccf7c480 (diff)
downloadchromium_src-ef8bd2c73cd3b3dcadfa01348672b40900d01d42.zip
chromium_src-ef8bd2c73cd3b3dcadfa01348672b40900d01d42.tar.gz
chromium_src-ef8bd2c73cd3b3dcadfa01348672b40900d01d42.tar.bz2
Enable Time::ThreadNow() on Android
The current posix implementation supports getting the thread time but it was not enabled. This change enables it for Android. It was tested on N4, N7 2012 and 2013. BUG=317828 Review URL: https://codereview.chromium.org/69393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/time/time.h')
-rw-r--r--base/time/time.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/time/time.h b/base/time/time.h
index cbe21b0..40566b9 100644
--- a/base/time/time.h
+++ b/base/time/time.h
@@ -549,7 +549,7 @@ class BASE_EXPORT TimeTicks {
// Returns true if ThreadNow() is supported on this system.
static bool IsThreadNowSupported() {
#if (defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \
- (defined(OS_MACOSX) && !defined(OS_IOS))
+ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_ANDROID)
return true;
#else
return false;