diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-15 11:06:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 11:06:26 +0000 |
| commit | d954c6b92024fbb183ea3acb7366a39765a6e3c0 (patch) | |
| tree | 6e00c37c4e8cde8a21d1f03d0bee7ca888a2fa35 /core | |
| parent | 554bb7b61081e80d79bf29a3690ba6fff391df55 (diff) | |
| parent | 60b9496c016f81df8f1c4202ba8a5190543900d5 (diff) | |
| download | build-d954c6b92024fbb183ea3acb7366a39765a6e3c0.zip build-d954c6b92024fbb183ea3acb7366a39765a6e3c0.tar.gz build-d954c6b92024fbb183ea3acb7366a39765a6e3c0.tar.bz2 | |
am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '60b9496c016f81df8f1c4202ba8a5190543900d5':
"desktop" linux has Posix clocks.
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/include/arch/linux-x86/AndroidConfig.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/combo/include/arch/linux-x86/AndroidConfig.h b/core/combo/include/arch/linux-x86/AndroidConfig.h index 284210c..0740186 100644 --- a/core/combo/include/arch/linux-x86/AndroidConfig.h +++ b/core/combo/include/arch/linux-x86/AndroidConfig.h @@ -128,11 +128,8 @@ /* * Define this if have clock_gettime() and friends - * - * Desktop Linux has this in librt, but it's broken in goobuntu, yielding - * mildly or wildly inaccurate results. */ -/*#define HAVE_POSIX_CLOCKS*/ +#define HAVE_POSIX_CLOCKS /* * Define this if we have linux style epoll() |