From 0f001b67fea27f8d60afc4677e8970d32a4e3792 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 12 Sep 2014 11:35:05 -0700 Subject: [PATCH] Remove "private/bionic_pthread.h". Bug: 17476168 Change-Id: Id642987e641de81e914a28daea4ffe9d11e090ed --- libc/bionic/ndk_cruft.cpp | 5 ++++ libc/bionic/pthread_gettid_np.cpp | 6 ----- libc/private/bionic_pthread.h | 41 ------------------------------- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 libc/private/bionic_pthread.h diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp index 829e8f3b6..2cd2e33bb 100644 --- a/libc/bionic/ndk_cruft.cpp +++ b/libc/bionic/ndk_cruft.cpp @@ -320,4 +320,9 @@ extern "C" size_t dlmalloc_usable_size(void* ptr) { return malloc_usable_size(ptr); } +// In L we added a public pthread_gettid_np, but some apps were using the private API. +extern "C" pid_t __pthread_gettid(pthread_t t) { + return pthread_gettid_np(t); +} + #endif diff --git a/libc/bionic/pthread_gettid_np.cpp b/libc/bionic/pthread_gettid_np.cpp index f4663a739..c996a0522 100644 --- a/libc/bionic/pthread_gettid_np.cpp +++ b/libc/bionic/pthread_gettid_np.cpp @@ -27,13 +27,7 @@ */ #include "pthread_internal.h" -#include "private/bionic_pthread.h" pid_t pthread_gettid_np(pthread_t t) { return reinterpret_cast(t)->tid; } - -// TODO: move callers over to pthread_gettid_np and remove this. -pid_t __pthread_gettid(pthread_t t) { - return pthread_gettid_np(t); -} diff --git a/libc/private/bionic_pthread.h b/libc/private/bionic_pthread.h deleted file mode 100644 index 07bcbd4b0..000000000 --- a/libc/private/bionic_pthread.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _BIONIC_PTHREAD_H -#define _BIONIC_PTHREAD_H - -#include - -__BEGIN_DECLS - -/* Internal, not an NDK API */ -extern pid_t __pthread_gettid(pthread_t thid); - -__END_DECLS - -#endif /* _BIONIC_PTHREAD_H */