Merge branch 'main' into bidi

VinayGuthal · VinayGuthal · commit 907feb0c9123 · 2025-03-27T16:29:28.000-04:00
diff --git a/firebase-crashlytics-ndk/CHANGELOG.md b/firebase-crashlytics-ndk/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-
+# 19.4.3
+* [changed] Updated internal Crashpad version to commit `21a20e`.
 
 # 19.4.2
 * [changed] Updated `firebase-crashlytics` dependency to v19.4.2
diff --git a/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle b/firebase-crashlytics-ndk/firebase-crashlytics-ndk.gradle
@@ -37,7 +37,7 @@ android {
         timeOutInMs 60 * 1000
     }
     namespace "com.google.firebase.crashlytics.ndk"
-    ndkVersion "25.1.8937393"
+    ndkVersion "27.2.12479018"
     compileSdkVersion project.compileSdkVersion
     defaultConfig {
         minSdkVersion project.minSdkVersion
diff --git a/firebase-crashlytics-ndk/src/main/jni/Application.mk b/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
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_client/Android.mk
@@ -17,7 +17,7 @@ LOCAL_CPPFLAGS := \
     -Wall \
     -Os \
     -flto \
-    -std=c++17 \
+    -std=c++20 \
 
 LOCAL_SRC_FILES := \
     $(THIRD_PARTY_PATH)/crashpad/client/annotation.cc \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_compat/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_compat/Android.mk
@@ -21,7 +21,7 @@ LOCAL_EXPORT_C_INCLUDES := \
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
     -Wall \
-    -std=c++17 \
+    -std=c++20 \
     -Os \
     -flto \
     -fvisibility=hidden \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_handler_lib/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_handler_lib/Android.mk
@@ -13,7 +13,7 @@ LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
     -DCRASHPAD_ZLIB_SOURCE_SYSTEM \
     -Wall \
-    -std=c++17 \
+    -std=c++20 \
     -Os \
     -flto \
     -fvisibility=hidden \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_minidump/Android.mk
@@ -8,7 +8,7 @@ LOCAL_MODULE := crashpad_minidump
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -flto \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_snapshot/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_snapshot/Android.mk
@@ -8,7 +8,7 @@ LOCAL_MODULE := crashpad_snapshot
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -flto \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_tool_support/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_tool_support/Android.mk
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/crashpad
 
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -flto \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/crashpad_util/Android.mk
@@ -18,7 +18,7 @@ LOCAL_CPPFLAGS := \
     -DZLIB_CONST \
     -DCRASHPAD_ZLIB_SOURCE_SYSTEM \
     -DCRASHPAD_LSS_SOURCE_EXTERNAL \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -flto \
@@ -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 \
diff --git a/firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk b/firebase-crashlytics-ndk/src/main/jni/crashpad/mini_chromium_base/Android.mk
@@ -10,7 +10,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/mini_chromium
 
 LOCAL_CPPFLAGS := \
     -D_FILE_OFFSET_BITS=64 \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -flto \
@@ -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 \
diff --git a/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/Android.mk b/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-common/Android.mk
@@ -18,7 +18,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_CPPFLAGS := \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -s \
diff --git a/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-handler/Android.mk b/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-handler/Android.mk
@@ -12,7 +12,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../libcrashlytics-common/include \
 
 LOCAL_CPPFLAGS := \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -s \
diff --git a/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-trampoline/Android.mk b/firebase-crashlytics-ndk/src/main/jni/libcrashlytics-trampoline/Android.mk
@@ -9,7 +9,7 @@ endif
 LOCAL_MODULE := crashlytics-trampoline
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_CPPFLAGS := \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -s \
diff --git a/firebase-crashlytics-ndk/src/main/jni/libcrashlytics/Android.mk b/firebase-crashlytics-ndk/src/main/jni/libcrashlytics/Android.mk
@@ -16,7 +16,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/$(THIRD_PARTY_PATH)/mini_chromium \
 
 LOCAL_CPPFLAGS := \
-    -std=c++17 \
+    -std=c++20 \
     -Wall \
     -Os \
     -s \
diff --git a/firebase-vertexai/firebase-vertexai.gradle.kts b/firebase-vertexai/firebase-vertexai.gradle.kts
@@ -67,6 +67,7 @@ android {
     targetSdk = targetSdkVersion
     baseline = file("lint-baseline.xml")
   }
+  sourceSets { getByName("test").java.srcDirs("src/testUtil") }
 }
 
 // Enable Kotlin "Explicit API Mode". This causes the Kotlin compiler to fail if any
diff --git a/firebase-vertexai/src/testUtil/java/com/google/firebase/vertexai/JavaCompileTests.java b/firebase-vertexai/src/testUtil/java/com/google/firebase/vertexai/JavaCompileTests.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright 2025 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.
+ */
+
+package java.com.google.firebase.vertexai;
+
+import android.graphics.Bitmap;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.firebase.concurrent.FirebaseExecutors;
+import com.google.firebase.vertexai.FirebaseVertexAI;
+import com.google.firebase.vertexai.GenerativeModel;
+import com.google.firebase.vertexai.java.ChatFutures;
+import com.google.firebase.vertexai.java.GenerativeModelFutures;
+import com.google.firebase.vertexai.type.BlockReason;
+import com.google.firebase.vertexai.type.Candidate;
+import com.google.firebase.vertexai.type.Citation;
+import com.google.firebase.vertexai.type.CitationMetadata;
+import com.google.firebase.vertexai.type.Content;
+import com.google.firebase.vertexai.type.ContentModality;
+import com.google.firebase.vertexai.type.CountTokensResponse;
+import com.google.firebase.vertexai.type.FileDataPart;
+import com.google.firebase.vertexai.type.FinishReason;
+import com.google.firebase.vertexai.type.FunctionCallPart;
+import com.google.firebase.vertexai.type.GenerateContentResponse;
+import com.google.firebase.vertexai.type.HarmCategory;
+import com.google.firebase.vertexai.type.HarmProbability;
+import com.google.firebase.vertexai.type.HarmSeverity;
+import com.google.firebase.vertexai.type.ImagePart;
+import com.google.firebase.vertexai.type.InlineDataPart;
+import com.google.firebase.vertexai.type.ModalityTokenCount;
+import com.google.firebase.vertexai.type.Part;
+import com.google.firebase.vertexai.type.PromptFeedback;
+import com.google.firebase.vertexai.type.SafetyRating;
+import com.google.firebase.vertexai.type.TextPart;
+import com.google.firebase.vertexai.type.UsageMetadata;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executor;
+import kotlinx.serialization.json.JsonElement;
+import kotlinx.serialization.json.JsonNull;
+import org.junit.Assert;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+/**
+ * Tests in this file exist to be compiled, not invoked
+ */
+public class JavaCompileTests {
+
+  public void initializeJava() throws Exception {
+    FirebaseVertexAI vertex = FirebaseVertexAI.getInstance();
+    GenerativeModel model = vertex.generativeModel("fake-model-name");
+    GenerativeModelFutures futures = GenerativeModelFutures.from(model);
+    testFutures(futures);
+  }
+
+  private void testFutures(GenerativeModelFutures futures) throws Exception {
+    Content content =
+        new Content.Builder()
+            .addText("Fake prompt")
+            .addFileData("fakeuri", "image/png")
+            .addInlineData(new byte[] {}, "text/json")
+            .addImage(Bitmap.createBitmap(0, 0, Bitmap.Config.HARDWARE))
+            .addPart(new FunctionCallPart("fakeFunction", Map.of("fakeArg", JsonNull.INSTANCE)))
+            .build();
+    // TODO b/406558430 Content.Builder.setParts and Content.Builder.setRole return void
+    Executor executor = FirebaseExecutors.directExecutor();
+    ListenableFuture<CountTokensResponse> countResponse = futures.countTokens(content);
+    validateCountTokensResponse(countResponse.get());
+    ListenableFuture<GenerateContentResponse> generateResponse = futures.generateContent(content);
+    validateGenerateContentResponse(generateResponse.get());
+    ChatFutures chat = futures.startChat();
+    ListenableFuture<GenerateContentResponse> future = chat.sendMessage(content);
+    future.addListener(
+        () -> {
+          try {
+            validateGenerateContentResponse(future.get());
+          } catch (Exception e) {
+            // Ignore
+          }
+        },
+        executor);
+    Publisher<GenerateContentResponse> responsePublisher = futures.generateContentStream(content);
+    responsePublisher.subscribe(
+        new Subscriber<GenerateContentResponse>() {
+          private boolean complete = false;
+
+          @Override
+          public void onSubscribe(Subscription s) {
+            s.request(Long.MAX_VALUE);
+          }
+
+          @Override
+          public void onNext(GenerateContentResponse response) {
+            Assert.assertFalse(complete);
+            validateGenerateContentResponse(response);
+          }
+
+          @Override
+          public void onError(Throwable t) {
+            // Ignore
+          }
+
+          @Override
+          public void onComplete() {
+            complete = true;
+          }
+        });
+  }
+
+  public void validateCountTokensResponse(CountTokensResponse response) {
+    int tokens = response.getTotalTokens();
+    Integer billable = response.getTotalBillableCharacters();
+    Assert.assertEquals(tokens, response.component1());
+    Assert.assertEquals(billable, response.component2());
+    Assert.assertEquals(response.getPromptTokensDetails(), response.component3());
+    for (ModalityTokenCount count : response.getPromptTokensDetails()) {
+      ContentModality modality = count.getModality();
+      int tokenCount = count.getTokenCount();
+    }
+  }
+
+  public void validateGenerateContentResponse(GenerateContentResponse response) {
+    List<Candidate> candidates = response.getCandidates();
+    if (candidates.size() == 1
+        && candidates.get(0).getContent().getParts().stream()
+            .anyMatch(p -> p instanceof TextPart && !((TextPart) p).getText().isEmpty())) {
+      String text = response.getText();
+      Assert.assertNotNull(text);
+      Assert.assertFalse(text.isBlank());
+    }
+    validateCandidates(candidates);
+    validateFunctionCalls(response.getFunctionCalls());
+    validatePromptFeedback(response.getPromptFeedback());
+    validateUsageMetadata(response.getUsageMetadata());
+  }
+
+  public void validateCandidates(List<Candidate> candidates) {
+    for (Candidate candidate : candidates) {
+      validateCitationMetadata(candidate.getCitationMetadata());
+      FinishReason reason = candidate.getFinishReason();
+      validateSafetyRatings(candidate.getSafetyRatings());
+      validateCitationMetadata(candidate.getCitationMetadata());
+      validateContent(candidate.getContent());
+    }
+  }
+
+  public void validateContent(Content content) {
+    String role = content.getRole();
+    for (Part part : content.getParts()) {
+      if (part instanceof TextPart) {
+        String text = ((TextPart) part).getText();
+      } else if (part instanceof ImagePart) {
+        Bitmap bitmap = ((ImagePart) part).getImage();
+      } else if (part instanceof InlineDataPart) {
+        String mime = ((InlineDataPart) part).getMimeType();
+        byte[] data = ((InlineDataPart) part).getInlineData();
+      } else if (part instanceof FileDataPart) {
+        String mime = ((FileDataPart) part).getMimeType();
+        String uri = ((FileDataPart) part).getUri();
+      }
+    }
+  }
+
+  public void validateCitationMetadata(CitationMetadata metadata) {
+    if (metadata != null) {
+      for (Citation citation : metadata.getCitations()) {
+        String uri = citation.getUri();
+        String license = citation.getLicense();
+        Calendar calendar = citation.getPublicationDate();
+        int startIndex = citation.getStartIndex();
+        int endIndex = citation.getEndIndex();
+        Assert.assertTrue(startIndex <= endIndex);
+      }
+    }
+  }
+
+  public void validateFunctionCalls(List<FunctionCallPart> parts) {
+    if (parts != null) {
+      for (FunctionCallPart part : parts) {
+        String functionName = part.getName();
+        Map<String, JsonElement> args = part.getArgs();
+        Assert.assertFalse(functionName.isBlank());
+      }
+    }
+  }
+
+  public void validatePromptFeedback(PromptFeedback feedback) {
+    if (feedback != null) {
+      String message = feedback.getBlockReasonMessage();
+      BlockReason reason = feedback.getBlockReason();
+      validateSafetyRatings(feedback.getSafetyRatings());
+    }
+  }
+
+  public void validateSafetyRatings(List<SafetyRating> ratings) {
+    for (SafetyRating rating : ratings) {
+      Boolean blocked = rating.getBlocked();
+      HarmCategory category = rating.getCategory();
+      HarmProbability probability = rating.getProbability();
+      float score = rating.getProbabilityScore();
+      HarmSeverity severity = rating.getSeverity();
+      Float severityScore = rating.getSeverityScore();
+      if (severity != null) {
+        Assert.assertNotNull(severityScore);
+      }
+    }
+  }
+
+  public void validateUsageMetadata(UsageMetadata metadata) {
+    if (metadata != null) {
+      int totalTokens = metadata.getTotalTokenCount();
+      int promptTokenCount = metadata.getPromptTokenCount();
+      for (ModalityTokenCount count : metadata.getPromptTokensDetails()) {
+        ContentModality modality = count.getModality();
+        int tokenCount = count.getTokenCount();
+      }
+      Integer candidatesTokenCount = metadata.getCandidatesTokenCount();
+      for (ModalityTokenCount count : metadata.getCandidatesTokensDetails()) {
+        ContentModality modality = count.getModality();
+        int tokenCount = count.getTokenCount();
+      }
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ android {`
`37`	`37`	`timeOutInMs 60 * 1000`
`38`	`38`	`}`
`39`	`39`	`namespace "com.google.firebase.crashlytics.ndk"`
`40`		`- ndkVersion "25.1.8937393"`
	`40`	`+ ndkVersion "27.2.12479018"`
`41`	`41`	`compileSdkVersion project.compileSdkVersion`
`42`	`42`	`defaultConfig {`
`43`	`43`	`minSdkVersion project.minSdkVersion`