diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-12 20:08:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 20:08:48 +0000 |
| commit | 8ac097a036d043a932d6159141cd05dc6066abfd (patch) | |
| tree | 0d3cd99edafe11db010bcec90b0af97daa893670 /libutils | |
| parent | abc75368a892bf2fa973a19e439e1b565c753ce2 (diff) | |
| parent | e4bf208ce8d893634a0f6f63ce34ec6498934d05 (diff) | |
| download | system_core-8ac097a036d043a932d6159141cd05dc6066abfd.zip system_core-8ac097a036d043a932d6159141cd05dc6066abfd.tar.gz system_core-8ac097a036d043a932d6159141cd05dc6066abfd.tar.bz2 | |
am e4bf208c: am 082a52b5: Merge "Move libutils over to pthread_gettid_np."
* commit 'e4bf208ce8d893634a0f6f63ce34ec6498934d05':
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 856a86c..0376c8c 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -94,8 +94,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; |