Merge branch 'dev' into bugfix/integration-tests-mac-openssl-error

Author: vimanyu

.github/workflows/cpp-packaging.yml

@@ -717,7 +717,7 @@ jobs:
       run: echo "CLOUDSDK_PYTHON=${{env.pythonLocation}}\python.exe" >> $GITHUB_ENV
     - name: Install Cloud SDK
       if: ${{ !cancelled() }}
-      uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      uses: google-github-actions/setup-gcloud@master
     - name: Upload Desktop Artifacts to GCS
       if: ${{ !cancelled() }}
       run: |

.github/workflows/integration_tests.yml

@@ -128,6 +128,13 @@ jobs:
           pip install -r scripts/gha/requirements.txt
           python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
 
+      - name: Install OpenSSL (windows)
+        if: matrix.target_platform == 'Desktop' &&
+            matrix.ssl_variant == 'openssl' &&
+            startsWith(matrix.os, 'windows')
+        run: |
+          choco install openssl -r
+
       - name: Build integration tests
         shell: bash
         run: |
@@ -150,7 +157,7 @@ jobs:
         run: echo "CLOUDSDK_PYTHON=${{env.pythonLocation}}\python.exe" >> $GITHUB_ENV
       - name: Install Cloud SDK
         if: ${{ !cancelled() }}
-        uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+        uses: google-github-actions/setup-gcloud@master
       - name: Upload Desktop Artifacts to GCS
         if: matrix.target_platform == 'Desktop' && !cancelled()
         run: |

app/CMakeLists.txt

@@ -298,6 +298,19 @@ else()
       "${app_desktop_HDRS}")
 endif()
 
+if(ANDROID OR IOS)
+  # If building for Android or iOS, include the Flatbuffers source files directly.
+  set(app_flatbuffers_srcs
+      ${FLATBUFFERS_SOURCE_DIR}/src/idl_parser.cpp
+      ${FLATBUFFERS_SOURCE_DIR}/src/idl_gen_text.cpp
+      ${FLATBUFFERS_SOURCE_DIR}/src/reflection.cpp
+      ${FLATBUFFERS_SOURCE_DIR}/src/util.cpp)
+  set(app_flatbuffers_lib)
+else()
+  set(app_flatbuffers_srcs)
+  set(app_flatbuffers_lib flatbuffers)
+endif()
+
 add_library(firebase_app STATIC
     ${log_SRCS}
     ${log_HDRS}
@@ -311,7 +324,8 @@ add_library(firebase_app STATIC
     memory/atomic.h
     meta/move.h
     memory/unique_ptr.h
-    memory/shared_ptr.h)
+    memory/shared_ptr.h
+    ${app_flatbuffers_srcs})
 
 set_property(TARGET firebase_app PROPERTY FOLDER "Firebase Cpp")
 
@@ -339,7 +353,7 @@ target_compile_definitions(firebase_app
 # firebase_app has a dependency on flatbuffers, which needs to be included.
 target_link_libraries(firebase_app
   PRIVATE
-    flatbuffers
+    ${app_flatbuffers_lib}
     ${LIBSECRET_LIBRARIES}
 )
 # Automatically include headers that might not be declared.

build_scripts/android/package.sh

@@ -53,5 +53,9 @@ for product in ${product_list[*]}; do
     done
     # Copy the top-level Proguard files in as well.
     cp -f "${sourcepath}/${product}/build/Release/${product}.pro" "${destpath}/libs/android/"
+    # Copy the special messaging aar file, but only if messaging was built.
+    if [[ "${product}" == "messaging" ]]; then
+        cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java-release.aar" "${destpath}/libs/android/firebase_messaging_cpp.aar"
+    fi
 done
 cd "${origpath}"