get libcutils building

Forwarded: not-needed

Gbp-Pq: Topic system/core
Gbp-Pq: Name fix-gettid-exception-declaration.patch

diff --git a/system/core/libcutils/include/cutils/threads.h b/system/core/libcutils/include/cutils/threads.h
index ba4846e33bdc52c512bed503b9a70898aae5559f..4d73924a7c3683b6a02d8074d5ef555aedccd0c8 100644 (file)
--- a/system/core/libcutils/include/cutils/threads.h
+++ b/system/core/libcutils/include/cutils/threads.h
@@ -33,7 +33,7 @@ extern "C" {
 // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows.
 //
 
-extern pid_t gettid();
+extern pid_t gettid(void) __THROW;
 
 //
 // Deprecated: use `_Thread_local` in C or `thread_local` in C++.

diff --git a/system/core/libcutils/threads.cpp b/system/core/libcutils/threads.cpp
index a7e6b2d8e27e3690b178023078739d5c9965f1b7..262632b0f5b9e375547cf23b1fef36a121e8c8f6 100644 (file)
--- a/system/core/libcutils/threads.cpp
+++ b/system/core/libcutils/threads.cpp
@@ -33,7 +33,7 @@
 
 // No definition needed for Android because we'll just pick up bionic's copy.
 #ifndef __ANDROID__
-pid_t gettid() {
+pid_t gettid(void) __THROW {
 #if defined(__APPLE__)
   uint64_t tid;
   pthread_threadid_np(NULL, &tid);