Skip to content

Commit a50cae7

Browse files
cynthiajoanCynthia Jiang
andauthored
revert boringssl for linux/windows for now (#290)
Co-authored-by: Cynthia Jiang <[email protected]>
1 parent e88046e commit a50cae7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/sdk_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
if: startsWith(matrix.os, 'ubuntu')
137137
shell: bash
138138
run: |
139-
./build_linux.sh -DFIREBASE_USE_BORINGSSL=ON ${{ github.event.inputs.additional_cmake_flags }}
139+
./build_linux.sh ${{ github.event.inputs.additional_cmake_flags }}
140140
141141
- name: Build SDK (MacOS)
142142
if: startsWith(matrix.os, 'macos')
@@ -151,7 +151,7 @@ jobs:
151151
# ./build_windows_x64.bat ${{ github.event.inputs.additional_cmake_flags }} TODO convert to python script
152152
mkdir ${{ matrix.build_dir }}
153153
pushd ${{ matrix.build_dir }}
154-
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 }}
154+
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 }}
155155
echo "=-=-=-=-=-=-=-=-="
156156
echo "Start Build"
157157
echo "=-=-=-=-=-=-=-=-="

scripts/build_scripts/build_zips.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"Any extra arguments wants to pass into cmake.")
9494
flags.DEFINE_bool("clean_build", False, "Whether to clean the build folder")
9595
flags.DEFINE_bool("use_boringssl", False, "Build with BoringSSL instead of openSSL.")
96+
flags.DEFINE_bool("verbose", False, "If verbose, cmake build with DCMAKE_VERBOSE_MAKEFILE=1")
9697

9798
def get_build_path(platform, clean_build=False):
9899
"""Get the folder that cmake configure and build in.
@@ -541,6 +542,9 @@ def main(argv):
541542
"-DFIREBASE_UNITY_BUILD_TESTS=ON",
542543
"-DFIREBASE_CPP_BUILD_STUB_TESTS=ON",
543544
]
545+
546+
if FLAGS.verbose:
547+
cmake_setup_args.append('-DCMAKE_VERBOSE_MAKEFILE=1')
544548

545549
unity_root_args = get_unity_engine_folder_args(FLAGS.unity_root)
546550
if unity_root_args:

0 commit comments

Comments
 (0)