From 0a272eb44b4c4984a4df4333cf439363b92d9174 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Wed, 15 Feb 2012 22:35:29 +0000 Subject: [PATCH] Disable SetAffinity on android CPU_ macros are only available in android source tree, not in NDK. Disable it for now. Review URL: https://webrtc-codereview.appspot.com/392008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1697 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/system_wrappers/source/thread_posix.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/system_wrappers/source/thread_posix.cc b/src/system_wrappers/source/thread_posix.cc index d0e7f1eb0c..05e7943503 100644 --- a/src/system_wrappers/source/thread_posix.cc +++ b/src/system_wrappers/source/thread_posix.cc @@ -195,7 +195,9 @@ bool ThreadPosix::Start(unsigned int& /*threadID*/) return true; } -#if (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) +// CPU_ZERO and CPU_SET are not available in NDK r7, so disable +// SetAffinity on Android for now. +#if (defined(WEBRTC_LINUX) && (!defined(WEBRTC_ANDROID))) bool ThreadPosix::SetAffinity(const int* processorNumbers, const unsigned int amountOfProcessors) { if (!processorNumbers || (amountOfProcessors == 0)) {