Remove playbilling (#384)

Author: dconeybe

app/src/future_manager.h

@@ -26,11 +26,7 @@
 #define FIREBASE_NAMESPACE firebase
 #endif
 
-#ifdef USE_PLAYBILLING_FUTURE
-#include "playbillingclient/future.h"
-#else
 #include "app/src/include/firebase/future.h"
-#endif
 
 namespace FIREBASE_NAMESPACE {
 

app/src/include/firebase/internal/future_impl.h

@@ -21,12 +21,7 @@
 
 // You shouldn't include future_impl.h directly, since its just the inline
 // implementation of the functions in future.h. Include future.h instead.
-// This is here to ensure that presubmit tests pass.
-#ifdef USE_PLAYBILLING_FUTURE
-#include "playbillingclient/future.h"
-#else
 #include "firebase/future.h"
-#endif
 
 #if defined(FIREBASE_USE_MOVE_OPERATORS)
 #include <utility>

app/src/include/firebase/util.h

@@ -23,11 +23,7 @@
 #define FIREBASE_NAMESPACE firebase
 #endif
 
-#ifdef USE_PLAYBILLING_FUTURE
-#include "playbillingclient/future.h"
-#else
 #include "firebase/future.h"
-#endif
 
 namespace FIREBASE_NAMESPACE {
 

app/src/reference_counted_future_impl.h

@@ -29,11 +29,7 @@
 #define FIREBASE_NAMESPACE firebase
 #endif
 
-#ifdef USE_PLAYBILLING_FUTURE
-#include "playbillingclient/future.h"
-#else
 #include "app/src/include/firebase/future.h"
-#endif
 
 namespace FIREBASE_NAMESPACE {
 

app/tests/CMakeLists.txt

@@ -394,14 +394,6 @@ firebase_cpp_cc_test(firebase_app_base64_test
     ${OPENSSL_CRYPTO_LIBRARY}
 )
 
-# google3 - thread/fiber/fiber.h (thread::Fiber)
-firebase_cpp_cc_test(firebase_app_future_playbillingclient_test
-  SOURCES
-    future_playbillingclient_test.cc
-  DEPENDS
-    firebase_app
-)
-
 # google3 - thread/fiber/fiber.h (thread::Fiber)
 firebase_cpp_cc_test(firebase_app_future_test
   SOURCES

cmake/future_lib.cmake

@@ -68,17 +68,11 @@ function(define_future_lib CPP_NAMESPACE)
     PRIVATE
       -DFIREBASE_NAMESPACE=${CPP_NAMESPACE}
   )
-  if("${CPP_NAMESPACE}" STREQUAL "playbillingclient")
-    target_compile_definitions("${library_name}"
-      PRIVATE
-        -DUSE_PLAYBILLING_FUTURE=1
-    )
-  endif()
   target_include_directories("${library_name}"
     PUBLIC
       ${PROJECT_BINARY_DIR}/future_include
     PRIVATE
       ${FUTURE_LIB_SRC_DIR}/..
       ${FUTURE_LIB_SRC_DIR}/../app/src/include
   )
-endfunction()
+endfunction()