Merge pull request #166 from firebase/feature/js-packaging2

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

Author: jonsimantov

.github/workflows/cpp-packaging.yml

@@ -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})

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/CMakeLists.txt

@@ -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')
-}
+}

admob/build.gradle

@@ -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/CMakeLists.txt

@@ -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')
-}
+}

analytics/build.gradle

@@ -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/CMakeLists.txt

@@ -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')
-}
+}

app/build.gradle

@@ -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/CMakeLists.txt

@@ -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')
-}
+}