From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Mon, 27 Jun 2022 17:30:12 +0000 (+0100)
Subject: get libcutils building
X-Git-Tag: archive/raspbian/29.0.6-19+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1dcb74898346038001515db5d7fb2fbf1cdcd57d;p=android-platform-tools.git

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 ba4846e3..4d73924a 100644
--- 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 a7e6b2d8..262632b0 100644
--- 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);