Skip to content

Commit f3ec436

Browse files
authored
Remove playbilling (#384)
1 parent 178d90a commit f3ec436

File tree

6 files changed

+1
-32
lines changed

6 files changed

+1
-32
lines changed

app/src/future_manager.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@
2626
#define FIREBASE_NAMESPACE firebase
2727
#endif
2828

29-
#ifdef USE_PLAYBILLING_FUTURE
30-
#include "playbillingclient/future.h"
31-
#else
3229
#include "app/src/include/firebase/future.h"
33-
#endif
3430

3531
namespace FIREBASE_NAMESPACE {
3632

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121

2222
// You shouldn't include future_impl.h directly, since its just the inline
2323
// implementation of the functions in future.h. Include future.h instead.
24-
// This is here to ensure that presubmit tests pass.
25-
#ifdef USE_PLAYBILLING_FUTURE
26-
#include "playbillingclient/future.h"
27-
#else
2824
#include "firebase/future.h"
29-
#endif
3025

3126
#if defined(FIREBASE_USE_MOVE_OPERATORS)
3227
#include <utility>

app/src/include/firebase/util.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@
2323
#define FIREBASE_NAMESPACE firebase
2424
#endif
2525

26-
#ifdef USE_PLAYBILLING_FUTURE
27-
#include "playbillingclient/future.h"
28-
#else
2926
#include "firebase/future.h"
30-
#endif
3127

3228
namespace FIREBASE_NAMESPACE {
3329

app/src/reference_counted_future_impl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
#define FIREBASE_NAMESPACE firebase
3030
#endif
3131

32-
#ifdef USE_PLAYBILLING_FUTURE
33-
#include "playbillingclient/future.h"
34-
#else
3532
#include "app/src/include/firebase/future.h"
36-
#endif
3733

3834
namespace FIREBASE_NAMESPACE {
3935

app/tests/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -394,14 +394,6 @@ firebase_cpp_cc_test(firebase_app_base64_test
394394
${OPENSSL_CRYPTO_LIBRARY}
395395
)
396396
397-
# google3 - thread/fiber/fiber.h (thread::Fiber)
398-
firebase_cpp_cc_test(firebase_app_future_playbillingclient_test
399-
SOURCES
400-
future_playbillingclient_test.cc
401-
DEPENDS
402-
firebase_app
403-
)
404-
405397
# google3 - thread/fiber/fiber.h (thread::Fiber)
406398
firebase_cpp_cc_test(firebase_app_future_test
407399
SOURCES

cmake/future_lib.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,11 @@ function(define_future_lib CPP_NAMESPACE)
6868
PRIVATE
6969
-DFIREBASE_NAMESPACE=${CPP_NAMESPACE}
7070
)
71-
if("${CPP_NAMESPACE}" STREQUAL "playbillingclient")
72-
target_compile_definitions("${library_name}"
73-
PRIVATE
74-
-DUSE_PLAYBILLING_FUTURE=1
75-
)
76-
endif()
7771
target_include_directories("${library_name}"
7872
PUBLIC
7973
${PROJECT_BINARY_DIR}/future_include
8074
PRIVATE
8175
${FUTURE_LIB_SRC_DIR}/..
8276
${FUTURE_LIB_SRC_DIR}/../app/src/include
8377
)
84-
endfunction()
78+
endfunction()

0 commit comments

Comments
 (0)