firebase
diff --git a/‎crashlytics/src/cpp/android/crashlytics_android.cc
Lines changed: 34 additions & 0 deletions b/‎crashlytics/src/cpp/android/crashlytics_android.cc
Lines changed: 34 additions & 0 deletions
diff --git a/‎crashlytics/src/cpp/android/crashlytics_android.h
Lines changed: 2 additions & 0 deletions b/‎crashlytics/src/cpp/android/crashlytics_android.h
Lines changed: 2 additions & 0 deletions
diff --git a/‎docs/readme.md
Lines changed: 40 additions & 4 deletions b/‎docs/readme.md
Lines changed: 40 additions & 4 deletions
diff --git a/‎firestore/empty.cc b/‎firestore/empty.cc
@@ -17,6 +17,7 @@
 #include <jni.h>
 
 #include "app/src/include/firebase/app.h"
+#include "app/src/log.h"
 #include "app/src/util_android.h"
 
 namespace firebase {
@@ -110,6 +111,22 @@ METHOD_LOOKUP_DEFINITION(java_stack_trace_element,
                          "java/lang/StackTraceElement",
                          JAVA_STACK_TRACE_ELEMENT);
 
+// clang-format off
+#define CRASHLYTICS_NDK_METHODS(X)                                     \
+  X(GetInstance, "getInstance",                                        \
+    "()Lcom/google/firebase/crashlytics/ndk/FirebaseCrashlyticsNdk;",  \
+    util::kMethodTypeStatic),                                          \
+  X(InstallSignalHandler, "installSignalHandler",                      \
+    "()V",                                                             \
+    util::kMethodTypeInstance)
+// clang-format on
+METHOD_LOOKUP_DECLARATION(firebase_crashlytics_ndk, CRASHLYTICS_NDK_METHODS);
+METHOD_LOOKUP_DEFINITION(
+    firebase_crashlytics_ndk,
+    PROGUARD_KEEP_CLASS
+    "com/google/firebase/crashlytics/ndk/FirebaseCrashlyticsNdk",
+    CRASHLYTICS_NDK_METHODS);
+
 static const int ANDROID_LOG_DEBUG = 3;
 static const char* EXCEPTION_MESSAGE_SEPARATOR = " : ";
 
@@ -176,6 +193,9 @@ CrashlyticsInternal::CrashlyticsInternal(App* app) {
   // We cache this value in case it was set to false on a previous run
   cached_data_collection_enabled_ =
       GetCrashlyticsCollectionEnabled(java_vm_, data_collection_obj_);
+
+  // For Unity apps, the signal handler must be explicitly installed
+  InstallNdkSignalHandler();
 }
 
 CrashlyticsInternal::~CrashlyticsInternal() {
@@ -205,6 +225,7 @@ bool CrashlyticsInternal::Initialize(JNIEnv* env, jobject activity) {
     }
     if (!(firebase_crashlytics::CacheMethodIds(env, activity) &&
           firebase_crashlytics::CacheFieldIds(env, activity) &&
+          firebase_crashlytics_ndk::CacheMethodIds(env, activity) &&
           crashlytics_core::CacheFieldIds(env, activity) &&
           crashlytics_data_collection::CacheMethodIds(env, activity) &&
           java_exception::CacheMethodIds(env, activity) &&
@@ -233,6 +254,19 @@ void CrashlyticsInternal::Terminate() {
   }
 }
 
+void CrashlyticsInternal::InstallNdkSignalHandler() {
+  firebase::LogDebug("Installing Crashlytics NDK signal handlers...");
+  JNIEnv* env = util::GetThreadsafeJNIEnv(java_vm_);
+  jobject ndk_obj =
+      env->CallStaticObjectMethod(firebase_crashlytics_ndk::GetClass(),
+                                  firebase_crashlytics_ndk::GetMethodId(
+                                      firebase_crashlytics_ndk::kGetInstance));
+  env->CallVoidMethod(ndk_obj,
+                      firebase_crashlytics_ndk::GetMethodId(
+                          firebase_crashlytics_ndk::kInstallSignalHandler));
+  env->DeleteLocalRef(ndk_obj);
+}
+
 void CrashlyticsInternal::Log(const char* message) {
   if (!cached_data_collection_enabled_) {
     return;
 
@@ -59,6 +59,8 @@ class CrashlyticsInternal {
                              std::vector<firebase::crashlytics::Frame>& frames);
   jobject BuildJavaStackTrace(std::vector<Frame>& frames);
 
+  void InstallNdkSignalHandler();
+
   static Mutex init_mutex_;
   static Mutex data_collection_mutex_;
   static int initialize_count_;
 
@@ -163,18 +163,54 @@ Support
 
 Release Notes
 -------------
-### Unreleased:
+### 8.5.0:
 -   Changes
-    - Crashlytics: Upload UnityFramework symbols in addition to the main app
-      dSYM file to improve symbolication
-      ([#673](https://github.com/firebase/quickstart-unity/issues/673)).
+    - General (iOS): iOS SDKs are now built using Xcode 13.0.0.
+    - Crashlytics: Improved crash reporting for Unity Android apps using the
+      IL2CPP scripting backend. To display symbolicated IL2CPP stack traces in
+      the Crashlytics console, Android customers will need to upload symbol
+      files for their builds. See the [Getting Started with Crashlytics Unity]
+      (https://firebase.google.com/docs/crashlytics/get-started?platform=unity)
+      Guild for more details.
+    - Firestore: Fixed an issue where the `Equals()` and `GetHashCode()` methods
+      of `DocumentSnapshot` would sometimes be inconsistent
+      ([#8647](https://github.com/firebase/firebase-ios-sdk/pull/8647)).
+
+### 8.4.0:
+-   Changes
+    - General: Added support for Android x86 64.
+    - Firestore: Improved the efficiency of progress callbacks in
+      `LoadBundleAsync()`.
+    - Firestore: Fixed crashes in Unity Editor on Linux caused by C++ exceptions
+      failing to be converted to C# exceptions.
+    - Firestore: Fixed intermittent hangs on Android when exceptions are thrown
+      by callbacks.
+    - Firestore: Fixed a crash on Android when `DocumentReference.Set()` was
+      invoked with an invalid `documentData` value (e.g. an int).
+    - Firestore: Fixed race conditions in the instance caching, terminate, and
+      disposal logic of `FirebaseFirestore`.
+
+### 8.3.0:
+-   Changes
+    - Firestore: Simplified the API for modifying the settings of a
+      `FirebaseFirestore` instance. This is a backwards-incompatible change and
+      requires updates to code that sets `FirebaseFirestore.Settings`.
+    - Firestore: Changed an argument to `Query.WhereNotIn()` from `List` to
+      `IEnumerable`, to be consistent with `Query.WhereIn()`.
+    - Messaging (Android): Fixes an issue with receiving tokens when
+      initializing the app.
 
 ### 8.2.0:
 -   Changes
     - Firestore: Removed `Equals` and `GetHashCode` methods from `Query`,
       `QuerySnapshot`, and `DocumentSnapshot` classes. These methods were
       unimplemented, and we plan to add proper support for them in a future
       release.
+    - Crashlytics: Upload UnityFramework symbols in addition to the main app
+      dSYM file to improve symbolication
+      ([#673](https://github.com/firebase/quickstart-unity/issues/673)).
+    - Messaging: Fixed a duplicate class error when building an application
+      which also uses Firebase Functions.
 
 ### 8.1.0:
 -   Changes