Merge "Remove gettid symbol from cutils" into main am: 0c0dafae8d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2681176 Change-Id: I4c44ab32cf585e89e06a2d343317a721cf0a63de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
26af0ec2d7
2 changed files with 0 additions and 46 deletions
|
@ -162,7 +162,6 @@ cc_library {
|
|||
"properties.cpp",
|
||||
"record_stream.cpp",
|
||||
"strlcpy.c",
|
||||
"threads.cpp",
|
||||
],
|
||||
|
||||
target: {
|
||||
|
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
** Copyright (C) 2007, The Android Open Source Project
|
||||
**
|
||||
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||
** you may not use this file except in compliance with the License.
|
||||
** You may obtain a copy of the License at
|
||||
**
|
||||
** http://www.apache.org/licenses/LICENSE-2.0
|
||||
**
|
||||
** Unless required by applicable law or agreed to in writing, software
|
||||
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
** See the License for the specific language governing permissions and
|
||||
** limitations under the License.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
#elif defined(__linux__)
|
||||
#include <pthread.h>
|
||||
#include <syscall.h>
|
||||
#include <unistd.h>
|
||||
#elif defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#if defined(__BIONIC__) || defined(__GLIBC__) && __GLIBC_MINOR__ >= 30
|
||||
// No definition needed for Android because we'll just pick up bionic's copy.
|
||||
// No definition needed for Glibc >= 2.30 because it exposes its own copy.
|
||||
#else
|
||||
extern "C" pid_t gettid() {
|
||||
#if defined(__APPLE__)
|
||||
uint64_t tid;
|
||||
pthread_threadid_np(NULL, &tid);
|
||||
return tid;
|
||||
#elif defined(__linux__)
|
||||
return syscall(__NR_gettid);
|
||||
#elif defined(_WIN32)
|
||||
return GetCurrentThreadId();
|
||||
#endif
|
||||
}
|
||||
#endif
|
Loading…
Reference in a new issue