From 0a231dfb40b2398f6eab65371ab87ee53bf7717e Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Mon, 24 Nov 2025 09:32:27 -0800
Subject: [PATCH] gfxstream: silence non-null Clang check on Android

Workaround:

src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp:82:51:
error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull]
   82 |     tss_set(gfxstream_connection_manager_tls_key, nullptr);
      |                                                   ^~~~~~~

Ultimately, the Bionic headers look wrong.  Passing NULL to tss_set
is completely legit.

Reviewed-by: David Gilhooley <djgilhooley.gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38632>
---
 .../guest/connection-manager/GfxStreamConnectionManager.cpp    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp
index 7b440ccf657..3cb61de443c 100644
--- a/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp
+++ b/src/gfxstream/guest/connection-manager/GfxStreamConnectionManager.cpp
@@ -79,7 +79,8 @@ void GfxStreamConnectionManager::resetThreadLocalInstance() {
     }
 
     delete tls;
-    tss_set(gfxstream_connection_manager_tls_key, nullptr);
+    void* null_ptr = nullptr;
+    tss_set(gfxstream_connection_manager_tls_key, null_ptr);
 }
 
 GfxStreamConnectionManager::GfxStreamConnectionManager(GfxStreamTransportType type,