Merge pull request #346 from firebase/feature/fix-android-windows-builds

Feature/fix android windows builds

Author: vimanyu

.github/workflows/android.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Add msbuild to PATH
         if: startsWith(matrix.os, 'windows')
         uses: microsoft/setup-msbuild@v1.0.2
-      
+
       - name: Cache NDK
         id: cache_ndk
         uses: actions/cache@v2
@@ -83,6 +83,26 @@ jobs:
         run: |
           build_scripts/android/install_prereqs.sh
 
+      - name: Add strings.exe to PATH (Windows only)
+        if: startsWith(matrix.os, 'windows')
+        shell: bash
+        run: |
+          # strings.exe was installed in repo root by install_prereqs.sh.
+          # There is another conflicting strings executable on Github runners.
+          # "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw64\bin\strings.exe"
+          # Make sure to prepend the one in our repo root to the path.
+          echo "${{ github.workspace }}" >> $GITHUB_PATH
+
+      - name: Run strings.exe once to accept license(Windows only)
+        if: startsWith(matrix.os, 'windows')
+        shell: bash
+        run: |
+          # This invocation is just to accept the license. Otherwise the command
+          # fails during build process. Also, running a command with just this
+          # flag makes the process exit with code 127 and stops the workflow.
+          # We ignore the error and continue with the rest of the steps.
+          strings -accepteula || true
+
       - name: Cache ccache files
         id: cache_ccache
         uses: actions/cache@v2

android_build_files/android_abis.gradle

@@ -23,7 +23,7 @@ android {
     ndk {
       // Default list of ABIs available in up-to-date NDK.
       abiFilters "x86", "armeabi-v7a", "arm64-v8a", "x86_64"
-      
+
       if (System.getenv("ANDROID_NDK_HOME").contains("r16b") ||
           System.getenv("ANDROID_NDK_HOME").contains("r11c")) {
         // Deprecated ABIs are added to the list when building using older NDKs only.

cmake/external_rules.cmake

@@ -63,7 +63,10 @@ function(download_external_sources)
 
   execute_process(
     COMMAND
-      ${ENV_COMMAND} cmake
+      ${ENV_COMMAND} ${CMAKE_COMMAND}
+      -G ${CMAKE_GENERATOR}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
       -DCMAKE_INSTALL_PREFIX=${FIREBASE_INSTALL_DIR}
       -DFIREBASE_DOWNLOAD_DIR=${FIREBASE_DOWNLOAD_DIR}
       -DFIREBASE_EXTERNAL_PLATFORM=${external_platform}
@@ -88,7 +91,7 @@ function(download_external_sources)
   endif()
 
   execute_process(
-    COMMAND ${ENV_COMMAND} cmake --build . -- ${cmake_build_args}
+    COMMAND ${ENV_COMMAND} ${CMAKE_COMMAND} --build . -- ${cmake_build_args}
     OUTPUT_FILE ${PROJECT_BINARY_DIR}/external/output_cmake_build.txt
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/external
   )

firestore/integration_test_internal/CMakeLists.txt

@@ -170,6 +170,9 @@ if(ANDROID)
     configure_file(abseil-cpp.cmake
       ${CMAKE_CURRENT_LIST_DIR}/external/abseil-cpp/CMakeLists.txt COPYONLY)
     execute_process(COMMAND ${CMAKE_COMMAND} .
+      -G ${CMAKE_GENERATOR}
+      -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
       RESULT_VARIABLE result
       WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/abseil-cpp )
     if(result)
@@ -211,6 +214,9 @@ if (NOT EXISTS ${GOOGLETEST_ROOT}/src/googletest/src/gtest-all.cc)
   configure_file(googletest.cmake
     ${CMAKE_CURRENT_LIST_DIR}/external/googletest/CMakeLists.txt COPYONLY)
   execute_process(COMMAND ${CMAKE_COMMAND} .
+    -G ${CMAKE_GENERATOR}
+    -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
     RESULT_VARIABLE result
     WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/external/googletest )
   if(result)

firestore/integration_test_internal/abseil-cpp.cmake

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cmake_minimum_required(VERSION 2.8)
 include(ExternalProject)
 
 set(version 20200225)

scripts/gha/print_matrix_configuration.py

@@ -85,12 +85,12 @@
 
   "android": {
     "matrix": {
-      "os": ["ubuntu-latest", "macos-latest"],
+      "os": ["ubuntu-latest", "macos-latest", "windows-latest"],
       "architecture": ["x64"],
       "python_version": ["3.7"],
 
       EXPANDED_KEY: {
-        "os": ["ubuntu-latest", "macos-latest"]
+        "os": ["ubuntu-latest", "macos-latest", "windows-latest"]
       }
     }
   },