Cherry pick PR #3176: Fix JNI cleanup on ATV for posix threads. (#3180)

Refer to the original PR: #3176 b/339018103 Change-Id: I45d941655a03824591af47ba70bc2be78b8bb95e Co-authored-by: Yavor Goulishev <[email protected]>
youtube · May 7, 2024 · f41cbf1 · f41cbf1
1 parent 6282cc1
commit f41cbf1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/starboard/android/shared/jni_env_ext.cc b/starboard/android/shared/jni_env_ext.cc
@@ -30,8 +30,9 @@ jobject g_application_class_loader = NULL;
 jobject g_starboard_bridge = NULL;
 
 void Destroy(void* value) {
-  // OnThreadShutdown() must be called on each thread before it is destroyed.
-  SB_DCHECK(value == NULL);
+  if (value != NULL) {
+    starboard::android::shared::JniEnvExt::OnThreadShutdown();
+  }
 }
 
 }  // namespace