From d950d9eda1c970d87d0d67c1fd46f06735030438 Mon Sep 17 00:00:00 2001 From: magjed Date: Thu, 24 Aug 2017 06:41:05 -0700 Subject: [PATCH] Fix rtc::CurrentThreadId() on Android We have been using the Linux way of getting the thread id on Android, even though we have a special code path for getting it on Android. BUG=webrtc:8110 Review-Url: https://codereview.webrtc.org/3001333002 Cr-Commit-Position: refs/heads/master@{#19494} --- webrtc/rtc_base/platform_thread.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/rtc_base/platform_thread.cc b/webrtc/rtc_base/platform_thread.cc index f65743ee3d..da5089a1c4 100644 --- a/webrtc/rtc_base/platform_thread.cc +++ b/webrtc/rtc_base/platform_thread.cc @@ -29,10 +29,10 @@ PlatformThreadId CurrentThreadId() { #elif defined(WEBRTC_POSIX) #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) ret = pthread_mach_thread_np(pthread_self()); -#elif defined(WEBRTC_LINUX) - ret = syscall(__NR_gettid); #elif defined(WEBRTC_ANDROID) ret = gettid(); +#elif defined(WEBRTC_LINUX) + ret = syscall(__NR_gettid); #else // Default implementation for nacl and solaris. ret = reinterpret_cast(pthread_self());