diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-12 18:48:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 18:48:59 +0000 |
| commit | e4bf208ce8d893634a0f6f63ce34ec6498934d05 (patch) | |
| tree | 3b32658a76a642d273c309b80acc698376750a71 /libutils | |
| parent | e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f (diff) | |
| parent | 082a52b57fb6d93186338062c179ffadd871f3c6 (diff) | |
| download | system_core-e4bf208ce8d893634a0f6f63ce34ec6498934d05.zip system_core-e4bf208ce8d893634a0f6f63ce34ec6498934d05.tar.gz system_core-e4bf208ce8d893634a0f6f63ce34ec6498934d05.tar.bz2 | |
am 082a52b5: Merge "Move libutils over to pthread_gettid_np."
* commit '082a52b57fb6d93186338062c179ffadd871f3c6':
Move libutils over to pthread_gettid_np.
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/Android.mk | 3 | ||||
| -rw-r--r-- | libutils/Threads.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 0c8625c..b55e635 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -93,8 +93,7 @@ endif LOCAL_CFLAGS += -Werror LOCAL_C_INCLUDES += \ - bionic/libc \ - external/zlib + external/zlib LOCAL_STATIC_LIBRARIES := \ libcutils diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp index 03fde97..9bcd063 100644 --- a/libutils/Threads.cpp +++ b/libutils/Threads.cpp @@ -28,9 +28,6 @@ # include <pthread.h> # include <sched.h> # include <sys/resource.h> -#ifdef HAVE_ANDROID_OS -# include <private/bionic_pthread.h> -#endif #elif defined(HAVE_WIN32_THREADS) # include <windows.h> # include <stdint.h> @@ -855,7 +852,7 @@ pid_t Thread::getTid() const pid_t tid; if (mRunning) { pthread_t pthread = android_thread_id_t_to_pthread(mThread); - tid = __pthread_gettid(pthread); + tid = pthread_gettid_np(pthread); } else { ALOGW("Thread (this=%p): getTid() is undefined before run()", this); tid = -1; |