revert boringssl for linux/windows for now (#290)

Co-authored-by: Cynthia Jiang <[email protected]>
firebase · May 12, 2022 · a50cae7 · a50cae7
1 parent e88046e
commit a50cae7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
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 -DFIREBASE_USE_BORINGSSL=ON ${{ github.event.inputs.additional_cmake_flags }}
  ./build_linux.sh ${{ github.event.inputs.additional_cmake_flags }}
 
  - name: Build SDK (MacOS)
  if: startsWith(matrix.os, 'macos')
@@ -151,7 151,7 @@ jobs:
  # ./build_windows_x64.bat ${{ github.event.inputs.additional_cmake_flags }} TODO convert to python script
  mkdir ${{ matrix.build_dir }}
  pushd ${{ matrix.build_dir }}
- cmake .. -G "Visual Studio 16 2019" -A x64 -DFIREBASE_CPP_SDK_DIR="${FIREBASE_CPP_SDK_DIR}" -DUNITY_ROOT_DIR="${UNITY_ROOT_DIR}" -DSWIG_DIR="${SWIG_DIR}" -DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=C:/hostedtoolcache/windows/Python/3.7.9/x64/python.exe -DFIREBASE_USE_BORINGSSL=ON ${{ github.event.inputs.additional_cmake_flags }}
  cmake .. -G "Visual Studio 16 2019" -A x64 -DFIREBASE_CPP_SDK_DIR="${FIREBASE_CPP_SDK_DIR}" -DUNITY_ROOT_DIR="${UNITY_ROOT_DIR}" -DSWIG_DIR="${SWIG_DIR}" -DFIREBASE_PYTHON_HOST_EXECUTABLE:FILEPATH=C:/hostedtoolcache/windows/Python/3.7.9/x64/python.exe ${{ github.event.inputs.additional_cmake_flags }}
  echo "=-=-=-=-=-=-=-=-="
  echo "Start Build"
  echo "=-=-=-=-=-=-=-=-="

diff --git a/scripts/build_scripts/build_zips.py b/scripts/build_scripts/build_zips.py
@@ -93,6 93,7 @@
  "Any extra arguments wants to pass into cmake.")
 flags.DEFINE_bool("clean_build", False, "Whether to clean the build folder")
 flags.DEFINE_bool("use_boringssl", False, "Build with BoringSSL instead of openSSL.")
 flags.DEFINE_bool("verbose", False, "If verbose, cmake build with DCMAKE_VERBOSE_MAKEFILE=1")
 
 def get_build_path(platform, clean_build=False):
  """Get the folder that cmake configure and build in.
@@ -541,6 542,9 @@ def main(argv):
  "-DFIREBASE_UNITY_BUILD_TESTS=ON",
  "-DFIREBASE_CPP_BUILD_STUB_TESTS=ON",
  ]
 
  if FLAGS.verbose:
  cmake_setup_args.append('-DCMAKE_VERBOSE_MAKEFILE=1')
 
  unity_root_args = get_unity_engine_folder_args(FLAGS.unity_root)
  if unity_root_args: