Continue work on packaging: Android and iOS done, Linux done, Mac done, Windows done (though still need /MD and /MT build pair).

CMakeLists.txt

@@ -67,6 +67,14 @@ option(FIREBASE_CPP_BUILD_PACKAGE
 option(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD
  "When building with Gradle, use the previously built libraries." OFF)
 
+set(FIREBASE_ANDROID_STL "" CACHE STRING "STL implementation to use.")
+if (NOT FIREBASE_ANDROID_STL STREQUAL "")
+ set(ANDROID_STL ${FIREBASE_ANDROID_STL})
+endif()
+
+set(FIREBASE_XCODE_TARGET_FORMAT "frameworks" CACHE STRING
+ "Format to output, 'frameworks' or 'libraries'")
+
 # Define this directory to be the root of the C++ SDK, which the libraries can
 # then refer to.
 set(FIREBASE_CPP_SDK_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR})

admob/CMakeLists.txt

@@ -120,9 +120,11 @@ elseif(IOS)
  # accomplish that.
  symlink_pod_headers(firebase_admob Google-Mobile-Ads-SDK GoogleMobileAds)
 
- set_target_properties(firebase_admob PROPERTIES
- FRAMEWORK TRUE
- )
+ if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
+ set_target_properties(firebase_admob PROPERTIES
+ FRAMEWORK TRUE
+ )
+ endif()
 endif()
 
 cpp_pack_library(firebase_admob "")

admob/build.gradle

@@ -30,6 +30,11 @@ allprojects {
 
 apply plugin: 'com.android.library'
 
+ext {
+ firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
+}
+
 android {
  compileSdkVersion 28
  buildToolsVersion '28.0.3'
@@ -67,8 +72,9 @@ android {
  // Only include needed project.
  arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
  '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
- '-DFIREBASE_INCLUDE_ADMOB=ON'
- }
+ '-DFIREBASE_INCLUDE_ADMOB=ON',
+"-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
+}
  }
  }
 
@@ -85,4 +91,4 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
  generateProguardFile('admob')
  setupDexDependencies(':admob:admob_resources')
-}
+}

analytics/CMakeLists.txt

@@ -128,9 +128,11 @@ elseif(IOS)
  FirebaseAnalytics
  )
 
- set_target_properties(firebase_analytics PROPERTIES
- FRAMEWORK TRUE
- )
+ if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
+ set_target_properties(firebase_analytics PROPERTIES
+ FRAMEWORK TRUE
+ )
+ endif()
 endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)

analytics/build.gradle

@@ -30,6 +30,11 @@ allprojects {
 
 apply plugin: 'com.android.library'
 
+ext {
+ firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
+}
+
 android {
  compileSdkVersion 28
  buildToolsVersion '28.0.3'
@@ -67,7 +72,8 @@ android {
  // Only include needed project.
  arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
  '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
- '-DFIREBASE_INCLUDE_ANALYTICS=ON'
+ '-DFIREBASE_INCLUDE_ANALYTICS=ON',
+"-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
  }
  }
  }
@@ -84,4 +90,4 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
  generateProguardFile('analytics')
-}
+}

app/CMakeLists.txt

@@ -377,9 +377,11 @@ endif()
 
 if (IOS)
  # IOS build framework
- set_target_properties(firebase_app PROPERTIES
- FRAMEWORK TRUE
- )
+ if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
+ set_target_properties(firebase_app PROPERTIES
+ FRAMEWORK TRUE
+ )
+ endif()
 
  # framework header files
  set(admob_HDRS

app/build.gradle

@@ -30,6 +30,11 @@ allprojects {
 
 apply plugin: 'com.android.library'
 
+ext {
+ firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
+}
+
 android {
  compileSdkVersion 28
  buildToolsVersion '28.0.3'
@@ -63,7 +68,8 @@ android {
  cmake {
  targets 'firebase_app'
  // Don't configure all the cmake subprojects.
- arguments '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF'
+ arguments '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
+ "-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
  }
  }
  }
@@ -80,4 +86,4 @@ project.afterEvaluate {
  setupDexDependencies(':app:app_resources')
  setupDexDependencies(':app:google_api_resources')
  setupDexDependencies(':app:invites_resources')
-}
+}

auth/CMakeLists.txt

@@ -200,9 +200,11 @@ elseif(IOS)
  FirebaseCore
  FirebaseAuth
  )
- set_target_properties(firebase_auth PROPERTIES
- FRAMEWORK TRUE
- )
+ if (FIREBASE_XCODE_TARGET_FORMAT STREQUAL "frameworks")
+ set_target_properties(firebase_auth PROPERTIES
+ FRAMEWORK TRUE
+ )
+ endif()
 endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)

auth/build.gradle

@@ -30,6 +30,11 @@ allprojects {
 
 apply plugin: 'com.android.library'
 
+ext {
+ firebaseAndroidStl = System.getenv('FIREBASE_ANDROID_STL')
+ firebaseAndroidStl = firebaseAndroidStl != null ? firebaseAndroidStl : ''
+}
+
 android {
  compileSdkVersion 28
  buildToolsVersion '28.0.3'
@@ -67,7 +72,8 @@ android {
  // Only include needed project.
  arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
  '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
- '-DFIREBASE_INCLUDE_AUTH=ON'
+ '-DFIREBASE_INCLUDE_AUTH=ON',
+"-DFIREBASE_ANDROID_STL=${firebaseAndroidStl}"
  }
  }
  }
@@ -85,4 +91,4 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
  generateProguardFile('auth')
  setupDexDependencies(':auth:auth_resources')
-}
+}

build_scripts/android/build.sh

@@ -1,10 +1,11 @@
-#!/bin/bash -ex
+#!/bin/bash -e
 
 buildpath=$1
 sourcepath=$2
+stl=$3
 
 if [[ -z "${buildpath}" || -z "${sourcepath}" ]]; then
- echo "Usage: $0 <build path> <source path>"
+ echo "Usage: $0 <build path> <source path> [c++|gnustl|stlport]"
  exit 1
 fi
 
@@ -13,26 +14,53 @@ if [[ ! -d "${sourcepath}" ]]; then
  exit 2
 fi
 
+if [[ "${stl}" == "c++" || "${stl}" == "gnustl" || "${stl}" == "stlport" ]]; then
+ export FIREBASE_ANDROID_STL="${stl}"_static
+elif [[ ! -z "${stl}" ]]; then
+ echo "Invalid STL specified."
+ echo "Valid STLs are: 'c++' (default), 'gnustl', or 'stlport'"
+ exit 2
+fi
+
+origpath=$( pwd -P )
+
 mkdir -p "${buildpath}"
 cd "${buildpath}"
 if [[ -n $(ls) ]]; then
  echo "Error: build path '${buildpath}' not empty."
  exit 2
 fi
 absbuildpath=$( pwd -P )
-cd -
+cd "${origpath}"
 
 # If NDK_ROOT is not set or is the wrong version, use to the version in /tmp.
 if [[ -z "${NDK_ROOT}" || ! $(grep -q "Pkg\.Revision = 16\." "${NDK_ROOT}/source.properties") ]]; then
  if [[ ! -d /tmp/android-ndk-r16b ]]; then
-echo "NDK r16b not present in /tmp, please run install_prereqs.sh script."
+echo "Recommended NDK version r16b not present in /tmp."
+if [[ ! -z "${stl}" ]]; then
+ echo "STL may only be specified if using the recommended NDK version."
+ echo "Please run install_prereqs.sh script and try again."
+ exit 2
+else
+ echo "Please run install_prereqs.sh if you wish to use the recommended NDK version."
+ echo "Continuing with default NDK..."
+ sleep 2
+fi
  fi
  export NDK_ROOT=/tmp/android-ndk-r16b
+ export ANDROID_NDK_HOME=/tmp/android-ndk-r16b
 fi
-set -ex
 cd "${sourcepath}"
-./gradlew assembleRelease
-set +x
+set +e
+# Retry the build up to 10 times, because the build fetches files from
+# maven and elsewhere, and occasionally the GitHub runners have
+# network connectivity issues that cause the download to fail.
+for retry in {1..10} error; do
+ if [[ $retry == "error" ]]; then exit 5; fi
+ ./gradlew assembleRelease && break
+ sleep 300
+done
+set -e
 
 # Gradle puts the build output inside the source tree, in various
 # "build" and ".externalNativeBuild" directories. Grab them and place

build_scripts/android/install_prereqs.sh

@@ -15,9 +15,17 @@ elif [[ $(uname) == "Linux" ]]; then
 else
  platform=windows
  # On Windows, we have an additional dependency for Strings
- curl -LSs \ curl -LSs \
- "https://download.sysinternals.com/files/Strings.zip" \
- --output Strings.zip
+ set +e
+ # Retry up to 10 times because Curl has a tendency to timeout on
+ # Github runners.
+ for retry in {1..10} error; do
+if [[ $retry == "error" ]]; then exit 5; fi
+curl -LSs \
+ "https://download.sysinternals.com/files/Strings.zip" \
+ --output Strings.zip && break
+sleep 300
+ done
+ set -e
  unzip -q Strings.zip && rm -f Strings.zip
 fi
 
@@ -61,12 +69,18 @@ if [[ -z "${NDK_ROOT}" || -z $(grep "Pkg\.Revision = 16\." "${NDK_ROOT}/source.p
  echo "Error, could not run 'curl' to download NDK. Is it in your PATH?"
  exit 1
 fi
-set -x
-curl -LSs \
- "https://dl.google.com/android/repository/android-ndk-r16b-${platform}-x86_64.zip" \
- --output /tmp/android-ndk-r16b.zip
+set +e
+# Retry up to 10 times because Curl has a tendency to timeout on
+# Github runners.
+for retry in {1..10} error; do
+ if [[ $retry == "error" ]]; then exit 5; fi
+ curl -LSs \
+ "https://dl.google.com/android/repository/android-ndk-r16b-${platform}-x86_64.zip" \
+ --output /tmp/android-ndk-r16b.zip && break
+ sleep 300
+done
+set -e
 (cd /tmp && unzip -q android-ndk-r16b.zip && rm -f android-ndk-r16b.zip)
-set +x
 echo "NDK r16b has been downloaded into /tmp/android-ndk-r16b"
  fi
 fi

build_scripts/android/package.sh

@@ -0,0 +1,57 @@
+#!/bin/bash -e
+
+readonly -a allowed_stl_variants=("c++" "gnustl" "stlport")
+builtpath=$1
+packagepath=$2
+stl=$3
+
+if [[ -z "${builtpath}" || -z "${packagepath}" || -z "${stl}" ]]; then
+ echo "Usage: $0 <built Android SDK path> <path to put packaged files into> <STL variant>"
+ echo "STL variant is one of: ${allowed_stl_variants[*]}"
+ exit 1
+fi
+
+if [[ ! " ${allowed_stl_variants[@]} " =~ " ${stl} " ]]; then
+ echo "Invalid STL variant '${stl}'. Allowed STL variants: ${allowed_stl_variants[*]}"
+ exit 2
+fi
+
+if [[ ! -d "${builtpath}/app/build" ]]; then
+ echo "Built Android SDK not found at path '${builtpath}'."
+ exit 2
+fi
+
+root_dir=$(cd $(dirname $0)/../..; pwd -P)
+. "${root_dir}/build_scripts/packaging.conf"
+origpath=$( pwd -P )
+
+mkdir -p "${packagepath}"
+cd "${packagepath}"
+destpath=$( pwd -P )
+cd "${origpath}"
+
+cd "${builtpath}"
+sourcepath=$( pwd -P )
+cd "${origpath}"
+
+mkdir -p "${destpath}/libs/android"
+
+# Copy each platform's libraries to the destination directory for this STL variant.
+cd "${sourcepath}"
+# Make sure we only copy the libraries in product_list (specified in packaging.conf)
+for product in ${product_list[*]}; do
+ if [[ ! -d "${product}/build/intermediates/cmake/release/obj" ]]; then
+continue
+ fi
+ dir="${product}/build/intermediates/cmake/release/obj"
+ for cpudir in "${dir}"/*; do
+cpu=$(basename ${cpudir})
+libsrc="${sourcepath}/${cpudir}/libfirebase_${product}.a"
+libdest="${destpath}/libs/android/${cpu}/${stl}"
+mkdir -p "${libdest}"
+cp -f "${libsrc}" "${libdest}/"
+ done
+ # Copy the top-level Proguard files in as well.
+ cp -f "${sourcepath}/${product}/build/Release/${product}.pro" "${destpath}/libs/android/"
+done
+cd "${origpath}"