File tree Expand file tree Collapse file tree 6 files changed +1
-32
lines changed Expand file tree Collapse file tree 6 files changed +1
-32
lines changed Original file line number Diff line number Diff line change 26
26
#define FIREBASE_NAMESPACE firebase
27
27
#endif
28
28
29
- #ifdef USE_PLAYBILLING_FUTURE
30
- #include " playbillingclient/future.h"
31
- #else
32
29
#include " app/src/include/firebase/future.h"
33
- #endif
34
30
35
31
namespace FIREBASE_NAMESPACE {
36
32
Original file line number Diff line number Diff line change 21
21
22
22
// You shouldn't include future_impl.h directly, since its just the inline
23
23
// 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
28
24
#include " firebase/future.h"
29
- #endif
30
25
31
26
#if defined(FIREBASE_USE_MOVE_OPERATORS)
32
27
#include < utility>
Original file line number Diff line number Diff line change 23
23
#define FIREBASE_NAMESPACE firebase
24
24
#endif
25
25
26
- #ifdef USE_PLAYBILLING_FUTURE
27
- #include " playbillingclient/future.h"
28
- #else
29
26
#include " firebase/future.h"
30
- #endif
31
27
32
28
namespace FIREBASE_NAMESPACE {
33
29
Original file line number Diff line number Diff line change 29
29
#define FIREBASE_NAMESPACE firebase
30
30
#endif
31
31
32
- #ifdef USE_PLAYBILLING_FUTURE
33
- #include " playbillingclient/future.h"
34
- #else
35
32
#include " app/src/include/firebase/future.h"
36
- #endif
37
33
38
34
namespace FIREBASE_NAMESPACE {
39
35
Original file line number Diff line number Diff line change @@ -394,14 +394,6 @@ firebase_cpp_cc_test(firebase_app_base64_test
394
394
${OPENSSL_CRYPTO_LIBRARY}
395
395
)
396
396
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
-
405
397
# google3 - thread/fiber/fiber.h (thread::Fiber)
406
398
firebase_cpp_cc_test(firebase_app_future_test
407
399
SOURCES
Original file line number Diff line number Diff line change @@ -68,17 +68,11 @@ function(define_future_lib CPP_NAMESPACE)
68
68
PRIVATE
69
69
-DFIREBASE_NAMESPACE=${CPP_NAMESPACE}
70
70
)
71
- if ("${CPP_NAMESPACE} " STREQUAL "playbillingclient" )
72
- target_compile_definitions ("${library_name} "
73
- PRIVATE
74
- -DUSE_PLAYBILLING_FUTURE=1
75
- )
76
- endif ()
77
71
target_include_directories ("${library_name} "
78
72
PUBLIC
79
73
${PROJECT_BINARY_DIR} /future_include
80
74
PRIVATE
81
75
${FUTURE_LIB_SRC_DIR} /..
82
76
${FUTURE_LIB_SRC_DIR} /../app/src/include
83
77
)
84
- endfunction ()
78
+ endfunction ()
You can’t perform that action at this time.
0 commit comments