Merge branch 'master' of github.com:firebase/firebase-android-sdk

Author: ankitaj224

firebase-crashlytics-ndk/firebase-crashlytics-ndk-proguard.txt

@@ -0,0 +1,17 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Prevent FirebaseCrashlytics from being obfuscated, because the Crashlytics
+# native libraries call FirebaseCrashlytics public methods dynamically via JNI.
+-keep public class com.google.firebase.crashlytics.FirebaseCrashlytics { public *; }

firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle

@@ -34,6 +34,7 @@ android {
         targetSdkVersion androidVersion
         versionName version
 
+        consumerProguardFiles 'firebase-crashlytics-ndk-proguard.txt'
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

firebase-crashlytics-ndk/src/main/jni/libcrashlytics/Android.mk

@@ -14,7 +14,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
 
 SRC_FILE_LIST := $(call rwildcard, $(LOCAL_PATH)/src/, *.cpp)
-SRC_FILE_LIST += $(LOCAL_PATH)/src/external/api_c.c
 
 LOCAL_SRC_FILES := $(SRC_FILE_LIST:$(LOCAL_PATH)/%=%)
 LOCAL_STATIC_LIBRARIES := breakpad_client

firebase-crashlytics-ndk/src/main/jni/libcrashlytics/include/crashlytics/external/crashlytics.h

@@ -328,9 +328,10 @@ public void onUserId_writesUserToReportMetadata() {
   public void onSessionsFinalize_finalizesReports() {
     final String sessionId = "testSessionId";
     reportManager.onBeginSession(sessionId, System.currentTimeMillis());
-    reportManager.finalizeSessions();
+    final long endedAt = System.currentTimeMillis();
+    reportManager.finalizeSessions(endedAt);
 
-    verify(reportPersistence).finalizeReports(sessionId);
+    verify(reportPersistence).finalizeReports(sessionId, endedAt);
   }
 
   @Test

firebase-crashlytics-ndk/src/main/jni/libcrashlytics/src/external/api_c.c

@@ -73,9 +73,12 @@ private static CrashlyticsReport.Session makeTestSession() {
     return Session.builder()
         .setGenerator("generator")
         .setIdentifier("identifier")
-        .setStartedAt(0)
+        .setStartedAt(1L)
+        .setEndedAt(1L)
+        .setCrashed(true)
         .setApp(makeTestApplication())
         .setUser(User.builder().setIdentifier("user").build())
+        .setGeneratorType(3)
         .build();
   }