Merge branch 'main' into ep/vertex-compile-tests

Author: emilypgoogle

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
-
+# 19.4.3
+* [changed] Updated internal Crashpad version to commit `8df174`.
 
 # 19.4.2
 * [changed] Updated `firebase-crashlytics` dependency to v19.4.2

firebase-crashlytics-ndk/src/main/jni/Application.mk

@@ -1,3 +1,3 @@
 APP_ABI := arm64-v8a armeabi-v7a x86_64 x86
 APP_STL := c++_static
-APP_PLATFORM := android-16
+APP_PLATFORM := android-21

firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk

@@ -44,6 +44,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/exception_handler_protocol.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/initial_signal_dispositions.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/memory_map.cc \
+    $(THIRD_PARTY_PATH)/crashpad/util/linux/pac_helper.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/proc_stat_reader.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/proc_task_reader.cc \
     $(THIRD_PARTY_PATH)/crashpad/util/linux/ptrace_broker.cc \

firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk

@@ -25,6 +25,7 @@ LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/mini_chromium/base/posix/safe_strerror.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/process/memory.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/rand_util.cc \
+    $(THIRD_PARTY_PATH)/mini_chromium/base/strings/pattern.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_number_conversions.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/string_util.cc \
     $(THIRD_PARTY_PATH)/mini_chromium/base/strings/stringprintf.cc \

firebase-crashlytics-ndk/src/third_party/crashpad

@@ -1,4 +1,6 @@
 # Unreleased
+* [feature] Emits a warning when attempting to use an incompatible model with
+  `GenerativeModel` or `ImagenModel`.
 * [changed] Added new exception type for quota exceeded scenarios.
 * [feature] `CountTokenRequest` now includes `GenerationConfig` from the model.
 * [changed] **Breaking Change**: `ImagenInlineImage.data` now returns the raw

firebase-crashlytics-ndk/src/third_party/lss

@@ -16,6 +16,7 @@
 
 package com.google.firebase.vertexai
 
+import android.util.Log
 import com.google.firebase.Firebase
 import com.google.firebase.FirebaseApp
 import com.google.firebase.app
@@ -68,6 +69,15 @@ internal constructor(
     if (location.trim().isEmpty() || location.contains("/")) {
       throw InvalidLocationException(location)
     }
+    if (!modelName.startsWith(GEMINI_MODEL_NAME_PREFIX)) {
+      Log.w(
+        TAG,
+        """Unsupported Gemini model "${modelName}"; see
+      https://firebase.google.com/docs/vertex-ai/models for a list supported Gemini model names.
+      """
+          .trimIndent()
+      )
+    }
     return GenerativeModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
@@ -103,6 +113,15 @@ internal constructor(
     if (location.trim().isEmpty() || location.contains("/")) {
       throw InvalidLocationException(location)
     }
+    if (!modelName.startsWith(IMAGEN_MODEL_NAME_PREFIX)) {
+      Log.w(
+        TAG,
+        """Unsupported Imagen model "${modelName}"; see
+      https://firebase.google.com/docs/vertex-ai/models for a list supported Imagen model names.
+      """
+          .trimIndent()
+      )
+    }
     return ImagenModel(
       "projects/${firebaseApp.options.projectId}/locations/${location}/publishers/google/models/${modelName}",
       firebaseApp.options.apiKey,
@@ -136,6 +155,12 @@ internal constructor(
       val multiResourceComponent = app[FirebaseVertexAIMultiResourceComponent::class.java]
       return multiResourceComponent.get(location)
     }
+
+    private const val GEMINI_MODEL_NAME_PREFIX = "gemini-"
+
+    private const val IMAGEN_MODEL_NAME_PREFIX = "imagen-"
+
+    private val TAG = FirebaseVertexAI::class.java.simpleName
   }
 }