Hide the instance id desktop implementation behind a feature flag in open source

PiperOrigin-RevId: 275555534

Author: a-maurice

CMakeLists.txt

@@ -44,6 +44,8 @@ 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_INSTANCE_ID_DESKTOP
+       "Use the experimental Instance Id desktop implementation." OFF)
 
 if(WIN32)
   # Turn on the use of the __cplusplus compiler define that is used to detect if

app/CMakeLists.txt

@@ -373,7 +373,9 @@ endif()
 if (NOT ANDROID AND NOT IOS)
   # Add the rest subdirectory, so that other libraries can access it
   add_subdirectory(rest)
-  add_subdirectory(instance_id)
+  if (FIREBASE_INSTANCE_ID_DESKTOP)
+    add_subdirectory(instance_id)
+  endif()
 endif()
 
 if(FIREBASE_CPP_BUILD_TESTS)

instance_id/CMakeLists.txt

@@ -55,7 +55,7 @@ else()
       "${desktop_SRCS}")
 endif()
 
-if(ANDROID OR IOS OR use_stub)
+if(ANDROID OR IOS OR use_stub OR NOT FIREBASE_INSTANCE_ID_DESKTOP)
   set(additional_link_LIB)
 else()
   set(additional_link_LIB

remote_config/CMakeLists.txt

@@ -81,9 +81,14 @@ else()
       ${FLATBUFFERS_SOURCE_DIR}/include
       ${NANOPB_INCLUDE_DIRS}
       ${PROJECT_BINARY_DIR}/..)
+  if(FIREBASE_INSTANCE_ID_DESKTOP)
+    set(iid_desktop firebase_instance_id_desktop_impl)
+  else()
+    set(iid_desktop)
+  endif()
   set(additional_link_LIB
       firebase_rest_lib
-      firebase_instance_id_desktop_impl
+      ${iid_desktop}
       flatbuffers)
 endif()
 

test_linux.sh

@@ -27,7 +27,7 @@ cd linux_build
 
 # Configure cmake with tests enabled
 # and disable use of libsecret due to not working on kokoro builders
-cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_FORCE_FAKE_SECURE_STORAGE=ON
+cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_FORCE_FAKE_SECURE_STORAGE=ON -DFIREBASE_INSTANCE_ID_DESKTOP=ON
 
 # Build the SDK and the tests
 cmake --build .

test_mac_x64.sh

@@ -27,7 +27,7 @@ cd mac_x64_build
 
 # Configure cmake with tests enabled
 # and disable use of libsecret due to not working on kokoro builders
-cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_FORCE_FAKE_SECURE_STORAGE=ON
+cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_FORCE_FAKE_SECURE_STORAGE=ON -DFIREBASE_INSTANCE_ID_DESKTOP=ON
 
 # Build the SDK and the tests
 cmake --build .

test_windows_x32.bat

@@ -47,7 +47,7 @@ EXIT /B %status%
   mkdir windows_%~1
   pushd windows_%~1
 
-  cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DPROTOBUF_SRC_ROOT_FOLDER=%PROTOBUF_SRC_ROOT_FOLDER% -DOPENSSL_ROOT_DIR="%~2" %~3
+  cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_INSTANCE_ID_DESKTOP=ON -DPROTOBUF_SRC_ROOT_FOLDER=%PROTOBUF_SRC_ROOT_FOLDER% -DOPENSSL_ROOT_DIR="%~2" %~3
 
   :: Check for errors, and return if there were any
   if %errorlevel% neq 0 (

test_windows_x64.bat

@@ -47,7 +47,7 @@ EXIT /B %status%
   mkdir windows_%~1
   pushd windows_%~1
 
-  cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DPROTOBUF_SRC_ROOT_FOLDER=%PROTOBUF_SRC_ROOT_FOLDER% -DOPENSSL_ROOT_DIR="%~2" %~3
+  cmake .. -DFIREBASE_CPP_BUILD_TESTS=ON -DFIREBASE_INSTANCE_ID_DESKTOP=ON -DPROTOBUF_SRC_ROOT_FOLDER=%PROTOBUF_SRC_ROOT_FOLDER% -DOPENSSL_ROOT_DIR="%~2" %~3
 
   :: Check for errors, and return if there were any
   if %errorlevel% neq 0 (