Merge branch 'main' into swift

jonsimantov · web-flow · commit 4bedd01e1b04 · 2024-02-01T10:23:28.000-08:00
diff --git a/messaging/CMakeLists.txt b/messaging/CMakeLists.txt
@@ -112,7 +112,7 @@ if(ANDROID)
 
   # Expose the Messaging Java AAR file as a target
   set(FIREBASE_MESSAGING_JAVA_AAR_PATH
-    "${CMAKE_CURRENT_LIST_DIR}/messaging_java/build/outputs/aar/messaging_java.aar")
+    "${CMAKE_CURRENT_LIST_DIR}/messaging_java/build/outputs/aar/messaging_java-release.aar")
   firebase_cpp_gradle(":messaging:messaging_java:assemble"
     "${FIREBASE_MESSAGING_JAVA_AAR_PATH}"
   )

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ if(ANDROID)`
`112`	`112`
`113`	`113`	`# Expose the Messaging Java AAR file as a target`
`114`	`114`	`set(FIREBASE_MESSAGING_JAVA_AAR_PATH`
`115`		`- "${CMAKE_CURRENT_LIST_DIR}/messaging_java/build/outputs/aar/messaging_java.aar")`
	`115`	`+ "${CMAKE_CURRENT_LIST_DIR}/messaging_java/build/outputs/aar/messaging_java-release.aar")`
`116`	`116`	`firebase_cpp_gradle(":messaging:messaging_java:assemble"`
`117`	`117`	`"${FIREBASE_MESSAGING_JAVA_AAR_PATH}"`
`118`	`118`	`)`