Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4bf208c authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 082a52b5: Merge "Move libutils over to pthread_gettid_np." 

* commit '082a52b5':
  Move libutils over to pthread_gettid_np.
parents e70851f8 082a52b5

libutils/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ endif 
LOCAL_CFLAGS += -Werror



LOCAL_C_INCLUDES += \

		bionic/libc \

	external/zlib



LOCAL_STATIC_LIBRARIES := \

libutils/Threads.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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;