Add boringssl back to Linux, with the fixed C++ (#298)

a-maurice · web-flow · commit ad5ffd1c4795 · 2022-05-18T13:31:18.000-07:00
diff --git a/.github/workflows/sdk_build.yml b/.github/workflows/sdk_build.yml
@@ -136,7 +136,7 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu')
         shell: bash
         run: |
-          ./build_linux.sh ${{ github.event.inputs.additional_cmake_flags }}
+          ./build_linux.sh -DFIREBASE_USE_BORINGSSL=ON ${{ github.event.inputs.additional_cmake_flags }}
 
       - name: Build SDK (MacOS)
         if: startsWith(matrix.os, 'macos')
diff --git a/cmake/firebase_unity_version.cmake b/cmake/firebase_unity_version.cmake
@@ -27,7 +27,7 @@ set(FIREBASE_UNITY_JAR_RESOLVER_VERSION "1.2.171"
 )
 
 # https://github.com/firebase/firebase-cpp-sdk
-set(FIREBASE_CPP_SDK_PRESET_VERSION "v9.0.0"
+set(FIREBASE_CPP_SDK_PRESET_VERSION "origin/unity-v9.0.0"
    CACHE STRING
   "Version tag of Firebase CPP SDK to download (if no local or not passed in) and use (no trailing .0)"
 )

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ set(FIREBASE_UNITY_JAR_RESOLVER_VERSION "1.2.171"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`# https://github.com/firebase/firebase-cpp-sdk`
`30`		`-set(FIREBASE_CPP_SDK_PRESET_VERSION "v9.0.0"`
	`30`	`+set(FIREBASE_CPP_SDK_PRESET_VERSION "origin/unity-v9.0.0"`
`31`	`31`	`CACHE STRING`
`32`	`32`	`"Version tag of Firebase CPP SDK to download (if no local or not passed in) and use (no trailing .0)"`
`33`	`33`	`)`