Firebase C++ open source fixes

a-maurice · a-maurice · commit 517b3f16a5b7 · 2020-06-09T17:47:01.000-07:00
Update copybara logic to handle proguard files and leveldb
Work around bug in flatbuffers with file generation
Update Firestore to 1.13.0

PiperOrigin-RevId: 315535927
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -67,15 +67,16 @@ add_custom_command(
 # Build the google_services_generated.h header from the flatbuffer schema file.
 set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
+    "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
-build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/google_services.fbs"
-                  ""
-                  "app_generated_includes"
-                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
-                  "${FIREBASE_GEN_FILE_DIR}/app"
-                  ""
-                  "")
+flatbuffers_generate_headers(
+    TARGET generate_app_fbs
+    SCHEMAS "${CMAKE_CURRENT_LIST_DIR}/google_services.fbs"
+    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
+    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
+    INCLUDE_PREFIX "app"
+)
 
 set(log_common_SRCS
     src/log.cc
@@ -293,7 +294,6 @@ add_library(firebase_app STATIC
     ${internal_HDRS}
     ${utility_HDRS}
     ${app_platform_HDRS}
-    ${FIREBASE_GEN_FILE_DIR}/app/google_services_generated.h
     memory/atomic.h
     meta/move.h
     memory/unique_ptr.h
@@ -326,6 +326,7 @@ target_link_libraries(firebase_app
   PRIVATE
     flatbuffers
     ${LIBSECRET_LIBRARIES}
+    generate_app_fbs
 )
 # Automatically include headers that might not be declared.
 if(MSVC)
diff --git a/app/instance_id/CMakeLists.txt b/app/instance_id/CMakeLists.txt
@@ -24,8 +24,12 @@ enable_language(CXX)
 # Build the iid_data_generated.h header from the flatbuffer schema file.
 set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
+    "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "firebase::UniquePtr")
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
 build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/iid_data.fbs"
                   ""
                   "iid_data_generated_includes"
diff --git a/app/rest/tests/CMakeLists.txt b/app/rest/tests/CMakeLists.txt
@@ -16,15 +16,16 @@ include(binary_to_array)
 
 set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
+    "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
-build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
-                  ""
-                  "app_rest_generated_includes"
-                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
-                  "${FIREBASE_GEN_FILE_DIR}/app/rest"
-                  ""
-                  "")
+flatbuffers_generate_headers(
+    TARGET generate_app_rest_tests_fbs
+    SCHEMAS "${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
+    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
+    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
+    INCLUDE_PREFIX "app/rest"
+)
 
 binary_to_array("sample_resource"
     "${CMAKE_CURRENT_LIST_DIR}/testdata/sample.fbs"
@@ -34,14 +35,18 @@ binary_to_array("sample_resource"
 add_library(sample_resource_lib STATIC
   ${sample_resource_source}
   ${sample_resource_header}
-  ${FIREBASE_GEN_FILE_DIR}/app/rest/sample_generated.h
 )
 
 target_include_directories(sample_resource_lib
   PUBLIC
     ${FLATBUFFERS_SOURCE_DIR}/include
 )
 
+target_link_libraries(sample_resource_lib
+  PUBLIC
+    generate_app_rest_tests_fbs
+)
+
 firebase_cpp_cc_test(firebase_app_rest_request_test
   SOURCES
     request_test.h
diff --git a/auth/CMakeLists.txt b/auth/CMakeLists.txt
@@ -37,6 +37,9 @@ set(flatbuffer_schemas
     ${CMAKE_CURRENT_LIST_DIR}/src/desktop/rpcs/request.fbs
     ${CMAKE_CURRENT_LIST_DIR}/src/desktop/rpcs/response.fbs
     ${CMAKE_CURRENT_LIST_DIR}/src/desktop/user_data.fbs)
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
 build_flatbuffers("${flatbuffer_schemas}"
                   ""
                   "generate_request_fbs"
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
@@ -18,19 +18,12 @@ if(TARGET firestore)
   return()
 endif()
 
-# Pin to the first revision that includes these changes:
-# https://github.com/firebase/firebase-ios-sdk/pull/5052
-#
-# These changes are required for the firebase-ios-sdk build to interoperate
-# well with a wrapper build that also uses googletest. Once M67 iOS
-# releases with that change, this should point to the Firestore release tag.
-set(version a568a96f7e6cf26f74d3c04892d02c4a218d5566)
+set(version Firestore-1.13.0)
 
 ExternalProject_Add(
   firestore
 
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-  DOWNLOAD_NAME firestore-${version}.tar.gz
   URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
 
   PREFIX ${PROJECT_BINARY_DIR}
diff --git a/database/CMakeLists.txt b/database/CMakeLists.txt
@@ -74,12 +74,23 @@ set(desktop_flatbuffers_schemas
     "${desktop_flatbuffers_schema_dir}/persisted_query_spec.fbs"
     "${desktop_flatbuffers_schema_dir}/persisted_tracked_query.fbs"
     "${desktop_flatbuffers_schema_dir}/persisted_user_write_record.fbs")
-
-flatbuffers_generate_headers(
-    TARGET desktop_flatbuffers
-    INCLUDE "${CMAKE_CURRENT_LIST_DIR}"
-    INCLUDE_PREFIX "database/src/desktop/persistence"
-    SCHEMAS ${desktop_flatbuffers_schemas})
+set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
+    "--no-union-value-namespacing"
+    "--gen-generated"
+    "--gen-object-api"
+    "--cpp-ptr-type" "flatbuffers::unique_ptr")
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
+set(DATABASE_PERSISTENCE_GEN_DIR
+    "${FIREBASE_GEN_FILE_DIR}/database/src/desktop/persistence")
+build_flatbuffers("${desktop_flatbuffers_schemas}"
+                  "${CMAKE_CURRENT_LIST_DIR}"
+                  "database_persistence_generated_includes"
+                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
+                  "${DATABASE_PERSISTENCE_GEN_DIR}"
+                  ""
+                  "")
 
 # Source files used by the desktop implementation.
 set(desktop_SRCS
@@ -130,7 +141,12 @@ set(desktop_SRCS
     src/desktop/view/limited_filter.cc
     src/desktop/view/ranged_filter.cc
     src/desktop/view/view.cc
-    src/desktop/view/view_processor.cc)
+    src/desktop/view/view_processor.cc
+    ${DATABASE_PERSISTENCE_GEN_DIR}/persisted_compound_write_generated.h
+    ${DATABASE_PERSISTENCE_GEN_DIR}/persisted_query_params_generated.h
+    ${DATABASE_PERSISTENCE_GEN_DIR}/persisted_query_spec_generated.h
+    ${DATABASE_PERSISTENCE_GEN_DIR}/persisted_tracked_query_generated.h
+    ${DATABASE_PERSISTENCE_GEN_DIR}/persisted_user_write_record_generated.h)
 
 if(ANDROID)
   set(database_platform_SRCS
@@ -165,7 +181,6 @@ else()
 
   set(additional_link_LIB
       flatbuffers
-      desktop_flatbuffers
       firebase_rest_lib
       ${OPENSSL_CRYPTO_LIBRARY}
       leveldb
diff --git a/database/src/desktop/query_desktop.cc b/database/src/desktop/query_desktop.cc
@@ -136,7 +136,7 @@ class SingleValueEventRegistration : public ValueEventRegistration {
     }
   }
 
-  void FireCancelEvent(Error error) {
+  void FireCancelEvent(Error error) override {
     MutexLock lock(*listener_mutex_);
     if (single_listener_holder_ && *single_listener_holder_) {
       single_listener_holder_ = nullptr;
diff --git a/firestore/CMakeLists.txt b/firestore/CMakeLists.txt
@@ -184,7 +184,7 @@ target_link_libraries(firebase_firestore
 if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)
   target_link_libraries(firebase_firestore
     PRIVATE
-      firebase_firestore_api
+      firestore_core
   )
 endif()
 
diff --git a/messaging/CMakeLists.txt b/messaging/CMakeLists.txt
@@ -17,17 +17,18 @@
 # Build the generated header from the flatbuffer schema files.
 set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
+    "--gen-generated"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
 set(flatbuffer_schemas
     ${CMAKE_CURRENT_LIST_DIR}/src/android/schemas/messaging.fbs)
-build_flatbuffers("${flatbuffer_schemas}"
-                  ""
-                  "generate_messaging_fbs"
-                  "${FIREBASE_FLATBUFFERS_DEPENDENCIES}"
-                  "${FIREBASE_GEN_FILE_DIR}/messaging"
-                  ""
-                  "")
+flatbuffers_generate_headers(
+    TARGET generate_messaging_fbs
+    SCHEMAS "${flatbuffer_schemas}"
+    FLAGS ${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}
+    INCLUDE ${FIREBASE_FLATBUFFERS_DEPENDENCIES}
+    INCLUDE_PREFIX "messaging"
+)
 
 # Common source files used by all platforms
 set(common_SRCS
@@ -36,7 +37,6 @@ set(common_SRCS
 
 # Source files used by the Android implementation.
 set(android_SRCS
-    ${FIREBASE_GEN_FILE_DIR}/messaging/messaging_generated.h
     src/android/cpp/message_reader.cc
     src/android/cpp/message_reader.h
     src/android/cpp/messaging.cc)
@@ -76,6 +76,7 @@ if(ANDROID)
   target_link_libraries(firebase_messaging
     PRIVATE
       flatbuffers
+      generate_messaging_fbs
   )
 endif()
 # Public headers all refer to each other relative to the src/include directory,
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -26,6 +26,9 @@ set(FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS
     "--no-union-value-namespacing"
     "--gen-object-api"
     "--cpp-ptr-type" "flatbuffers::unique_ptr")
+# Because of a bug in the version of Flatbuffers we are pinned to,
+# additional flags need to be set.
+set(FLATC_ARGS "${FLATBUFFERS_FLATC_SCHEMA_EXTRA_ARGS}")
 build_flatbuffers("${CMAKE_CURRENT_LIST_DIR}/testdata_config.fbs"
                   ""
                   "generate_testing_fps"

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ class SingleValueEventRegistration : public ValueEventRegistration {`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`139`		`- void FireCancelEvent(Error error) {`
	`139`	`+ void FireCancelEvent(Error error) override {`
`140`	`140`	`MutexLock lock(*listener_mutex_);`
`141`	`141`	`if (single_listener_holder_ && *single_listener_holder_) {`
`142`	`142`	`single_listener_holder_ = nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ target_link_libraries(firebase_firestore`
`184`	`184`	`if(FIRESTORE_USE_EXTERNAL_CMAKE_BUILD)`
`185`	`185`	`target_link_libraries(firebase_firestore`
`186`	`186`	`PRIVATE`
`187`		`- firebase_firestore_api`
	`187`	`+ firestore_core`
`188`	`188`	`)`
`189`	`189`	`endif()`
`190`	`190`