Merge remote-tracking branch 'origin/master' into ghm

Author: a-maurice

Android/firebase_dependencies.gradle

@@ -23,6 +23,7 @@ def firebaseDependenciesMap = [
   'auth' : ['com.google.firebase:firebase-auth:19.2.0'],
   'database' : ['com.google.firebase:firebase-database:19.2.1'],
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links:19.1.0'],
+  'firestore' : ['com.google.firebase:firebase-firestore:21.4.0'],
   'functions' : ['com.google.firebase:firebase-functions:19.0.2'],
   'instance_id' : ['com.google.firebase:firebase-iid:20.0.2'],
   'invites' : ['com.google.firebase:firebase-invites:17.0.0'],
@@ -42,6 +43,7 @@ def firebaseResourceDependenciesMap = [
   'admob' : [':admob:admob_resources'],
   'auth' : [':auth:auth_resources'],
   'database' : [':database:database_resources'],
+  'firestore' : [':firestore:firestore_resources'],
   'storage' : [':storage:storage_resources']
 ]
 
@@ -74,6 +76,9 @@ class Dependencies {
   def getDynamicLinks() {
     libSet.add('dynamic_links')
   }
+  def getFirestore() {
+    libSet.add('firestore')
+  }
   def getFunctions() {
     libSet.add('functions')
   }

CMakeLists.txt

@@ -20,32 +20,52 @@ set (CMAKE_CXX_STANDARD 11)
 # Turn on virtual folders for visual studio
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+# Top level option that determines the default behavior of the include options
+# below. Useful for turning off all at once, and then turning on a specific one.
+option(FIREBASE_INCLUDE_LIBRARY_DEFAULT
+       "Should each library be included by default." ON)
 # Different options to enable/disable each library being included during
 # configuration.
-option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library." ON)
+option(FIREBASE_INCLUDE_ADMOB "Include the AdMob library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_ANALYTICS
-       "Include the Google Analytics for Firebase library." ON)
-option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library." ON)
+       "Include the Google Analytics for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+option(FIREBASE_INCLUDE_AUTH "Include the Firebase Authentication library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_DATABASE
-       "Include the Firebase Realtime Database library." ON)
+       "Include the Firebase Realtime Database library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_DYNAMIC_LINKS
-       "Include the Firebase Dynamic Links library." ON)
+       "Include the Firebase Dynamic Links library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+option(FIREBASE_INCLUDE_FIRESTORE
+       "Include the Cloud Firestore library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_FUNCTIONS
-       "Include the Cloud Functions for Firebase library." ON)
+       "Include the Cloud Functions for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_INSTANCE_ID
-       "Include the Firebase Instance ID library." ON)
+       "Include the Firebase Instance ID library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_MESSAGING
-       "Include the Firebase Cloud Messaging library." ON)
+       "Include the Firebase Cloud Messaging library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_REMOTE_CONFIG
-       "Include the Firebase Remote Config library." ON)
+       "Include the Firebase Remote Config library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_STORAGE
-       "Include the Cloud Storage for Firebase library." ON)
+       "Include the Cloud Storage for Firebase library."
+       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+
 option(FIREBASE_CPP_BUILD_TESTS
        "Enable the Firebase C++ Build Tests." OFF)
 option(FIREBASE_FORCE_FAKE_SECURE_STORAGE
        "Disable use of platform secret store and use fake impl." OFF)
 option(FIREBASE_CPP_BUILD_PACKAGE
        "Bundle the Firebase C++ libraries into a zip file." OFF)
+option(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD
+        "When building with Gradle, use the previously built libraries." OFF)
 
 # Define this directory to be the root of the C++ SDK, which the libraries can
 # then refer to.
@@ -94,10 +114,37 @@ set(FIREBASE_BINARY_DIR ${PROJECT_BINARY_DIR})
 set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR}/opt)
 set(FIREBASE_DOWNLOAD_DIR ${PROJECT_BINARY_DIR}/downloads)
 
-# Run the CMake build logic that will download all the external dependencies.
-message(STATUS "Downloading external project dependencies...")
-download_external_sources()
-message(STATUS "Download complete.")
+if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  # Figure out where app's binary_dir was.
+  string(REGEX REPLACE
+    "${CMAKE_CURRENT_LIST_DIR}/[^/]+/(.*)"
+    "${CMAKE_CURRENT_LIST_DIR}/app/\\1"
+    APP_BINARY_DIR "${FIREBASE_BINARY_DIR}")
+
+  set(FIRESTORE_SOURCE_DIR ${APP_BINARY_DIR}/external/src/firestore)
+else()
+  # Run the CMake build logic that will download all the external dependencies.
+  message(STATUS "Downloading external project dependencies...")
+  download_external_sources()
+  message(STATUS "Download complete.")
+
+  set(FIRESTORE_SOURCE_DIR ${FIREBASE_BINARY_DIR}/external/src/firestore)
+endif()
+
+# Include Firestore's external build early to resolve conflicts on packages.
+if(NOT ANDROID AND FIREBASE_INCLUDE_FIRESTORE)
+  set(FIRESTORE_BINARY_DIR ${FIRESTORE_SOURCE_DIR}-build)
+
+  set(
+    FIREBASE_IOS_BUILD_TESTS
+    ${FIREBASE_CPP_BUILD_TESTS}
+    CACHE BOOL "Force Firestore build tests to match"
+  )
+
+  add_subdirectory(${FIRESTORE_SOURCE_DIR} ${FIRESTORE_BINARY_DIR})
+
+  copy_subdirectory_definition(${FIRESTORE_SOURCE_DIR} NANOPB_SOURCE_DIR)
+endif()
 
 # Disable the Flatbuffer build tests, install and flathash
 set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
@@ -109,13 +156,17 @@ if(IOS OR ANDROID)
   set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
 endif()
 
-# Add flatbuffers as a subdirectory, and set the directory variables for it,
-# so that the sub Firebase projects can depend upon it if necessary.
-add_external_library(flatbuffers)
+if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  message(STATUS "flatbuffers is added with APP_BINARY_DIR ${APP_BINARY_DIR}")
+  add_external_library(flatbuffers BINARY_DIR "${APP_BINARY_DIR}")
+else()
+  message(STATUS "flatbuffers is added normally")
+  add_external_library(flatbuffers)
+endif()
 
-if(FIREBASE_CPP_BUILD_TESTS)
+if(FIREBASE_CPP_BUILD_TESTS AND NOT FIREBASE_INCLUDE_FIRESTORE)
+  # Firestore's external build pulls in googletest
   add_external_library(googletest)
-  add_external_library(absl)
 endif()
 
 # Some of the external libraries are not used for mobile.
@@ -202,15 +253,31 @@ if (NOT ANDROID AND NOT IOS)
         zlibstatic
     )
   endif()
+endif()
 
-  find_package(Protobuf)
-  if (PROTOBUF_FOUND)
-    # NanoPB requires Protobuf to be present, so only add it if it was found.
-    add_external_library(nanopb)
-    # NanoPB has a FindNanopb which defines the function to generate files, so
-    # add it to the module path, and use that.
-    list(INSERT CMAKE_MODULE_PATH 0 ${NANOPB_SOURCE_DIR}/extra)
-    find_package(Nanopb)
+if(NOT ANDROID)
+  if(FIREBASE_INCLUDE_FIRESTORE)
+    # The Firestore build includes protobuf and nanopb already
+    list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
+    find_package(Nanopb REQUIRED)
+
+    set(PROTOBUF_FOUND ON)
+  else()
+    find_package(Protobuf)
+    if (PROTOBUF_FOUND)
+      # NanoPB requires Protobuf to be present, so only add it if it was found.
+      add_external_library(nanopb)
+
+      # NanoPB has a FindNanopb which defines the function to generate files,
+      # so add it to the module path, and use that.
+      list(APPEND CMAKE_MODULE_PATH ${NANOPB_SOURCE_DIR}/extra)
+      find_package(Nanopb)
+
+      target_compile_definitions(
+        protobuf-nanopb-static
+        PUBLIC -DPB_FIELD_32BIT -DPB_ENABLE_MALLOC
+      )
+    endif()
   endif()
 endif()
 
@@ -290,8 +357,24 @@ if(FIREBASE_CPP_BUILD_TESTS)
   add_subdirectory(testing)
 endif()
 
-# App needs to come first, since other libraries will depend upon it.
-add_subdirectory(app)
+if(NOT FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
+  add_subdirectory(app)
+else()
+  # Add firebase_app as a target on the previously built app.
+  add_library(firebase_app STATIC IMPORTED GLOBAL)
+  file(MAKE_DIRECTORY "${APP_BINARY_DIR}/generated")
+  file(MAKE_DIRECTORY "${FIREBASE_BINARY_DIR}/generated")
+  set(app_include_dirs
+      "${CMAKE_CURRENT_LIST_DIR}/app/src/include"
+      "${APP_BINARY_DIR}/generated"
+      "${FIREBASE_BINARY_DIR}/generated"
+  )
+  set_target_properties(firebase_app PROPERTIES
+    IMPORTED_LOCATION "${APP_BINARY_DIR}/libfirebase_app.a"
+    INTERFACE_INCLUDE_DIRECTORIES "${app_include_dirs}"
+  )
+endif()
+
 if (FIREBASE_INCLUDE_ADMOB)
   add_subdirectory(admob)
 endif()
@@ -307,6 +390,9 @@ endif()
 if (FIREBASE_INCLUDE_DYNAMIC_LINKS)
   add_subdirectory(dynamic_links)
 endif()
+if (FIREBASE_INCLUDE_FIRESTORE)
+  add_subdirectory(firestore)
+endif()
 if (FIREBASE_INCLUDE_FUNCTIONS)
   add_subdirectory(functions)
 endif()

admob/build.gradle

@@ -62,6 +62,12 @@ android {
     externalNativeBuild {
       cmake {
         targets 'firebase_admob'
+        // Args are: Re-use app library prebuilt by app gradle project.
+        //           Don't configure all the cmake subprojects.
+        //           Only include needed project.
+        arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
+                '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
+                '-DFIREBASE_INCLUDE_ADMOB=ON'
       }
     }
   }

analytics/build.gradle

@@ -62,6 +62,12 @@ android {
     externalNativeBuild {
       cmake {
         targets 'firebase_analytics'
+        // Args are: Re-use app library prebuilt by app gradle project.
+        //           Don't configure all the cmake subprojects.
+        //           Only include needed project.
+        arguments '-DFIREBASE_CPP_USE_PRIOR_GRADLE_BUILD=ON',
+                '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF',
+                '-DFIREBASE_INCLUDE_ANALYTICS=ON'
       }
     }
   }

android_build_files/generate_proguard.gradle

@@ -64,7 +64,7 @@ def generateFinalProguard(Set<File> proguardSet, String outputProguard) {
 def defineGenerateProguardFile(String subproject, String buildType,
                                Action<File> callback) {
   Task t = tasks.getByName("externalNativeBuild$buildType").with {
-    String outputProguard = "$buildDir/${subproject}.pro"
+    String outputProguard = "$buildDir/$buildType/${subproject}.pro"
 
     outputs.file "$outputProguard"
     doLast {

app/build.gradle

@@ -62,6 +62,8 @@ android {
     externalNativeBuild {
       cmake {
         targets 'firebase_app'
+        // Don't configure all the cmake subprojects.
+        arguments '-DFIREBASE_INCLUDE_LIBRARY_DEFAULT=OFF'
       }
     }
   }

app/rest/tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright 2019 Google
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,22 +42,22 @@ target_include_directories(sample_resource_lib
     ${FLATBUFFERS_SOURCE_DIR}/include
 )
 
-cc_test(firebase_app_rest_request_test
+firebase_cpp_cc_test(firebase_app_rest_request_test
   SOURCES
     request_test.h
     request_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_request_binary_test
+firebase_cpp_cc_test(firebase_app_rest_request_binary_test
   SOURCES
     request_binary_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_request_json_test
+firebase_cpp_cc_test(firebase_app_rest_request_json_test
   SOURCES
     ../request_json.h
     request_json_test.cc
@@ -67,43 +67,43 @@ cc_test(firebase_app_rest_request_json_test
     sample_resource_lib
 )
 
-cc_test(firebase_app_rest_response_test
+firebase_cpp_cc_test(firebase_app_rest_response_test
   SOURCES
     response_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_response_binary_test
+firebase_cpp_cc_test(firebase_app_rest_response_binary_test
   SOURCES
     response_binary_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_response_json_test
+firebase_cpp_cc_test(firebase_app_rest_response_json_test
   SOURCES
     response_json_test.cc
   DEPENDS
     firebase_rest_lib
     sample_resource_lib
 )
 
-cc_test(firebase_app_rest_util_test
+firebase_cpp_cc_test(firebase_app_rest_util_test
   SOURCES
     util_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_www_form_url_encoded_test
+firebase_cpp_cc_test(firebase_app_rest_www_form_url_encoded_test
   SOURCES
     www_form_url_encoded_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
-cc_test(firebase_app_rest_transport_mock_test
+firebase_cpp_cc_test(firebase_app_rest_transport_mock_test
   SOURCES
     transport_mock_test.cc
     ../transport_mock.h
@@ -119,31 +119,31 @@ cc_test(firebase_app_rest_transport_mock_test
 #[[
 
 # google3 Dependency: FLAGS_test_tmpdir, CHECK(), CHECK_EQ
-cc_test(firebase_app_rest_request_file_test
+firebase_cpp_cc_test(firebase_app_rest_request_file_test
   SOURCES
     request_file_test.cc
   DEPENDS
     firebase_rest_lib
 )
 
 # google3 Dependency: absl/strings/escaping (absl::CEscape)
-cc_test(firebase_app_rest_gzipheader_unittest
+firebase_cpp_cc_test(firebase_app_rest_gzipheader_unittest
   SOURCES
     gzipheader_unittest.cc
   DEPENDS
     firebase_rest_lib
 )
 
 # google3 Dependency: absl/strings/escaping (absl::CEscape)
-cc_test(firebase_app_rest_zlibwrapper_unittest
+firebase_cpp_cc_test(firebase_app_rest_zlibwrapper_unittest
   SOURCES
     zlibwrapper_unittest.cc
   DEPENDS
     firebase_rest_lib
 )
 
 # google3 Dependency: net/.../http2server, net/util/ports.h (net_util::PickUnusedPort())
-cc_test(firebase_app_rest_transport_curl_test
+firebase_cpp_cc_test(firebase_app_rest_transport_curl_test
   SOURCES
     transport_curl_test.cc
   DEPENDS