Skip to content

Remove playbilling #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 21, 2021
Merged

Remove playbilling #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/src/future_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
5 changes: 0 additions & 5 deletions app/src/include/firebase/internal/future_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions app/src/include/firebase/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 0 additions & 4 deletions app/src/reference_counted_future_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 0 additions & 8 deletions app/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions cmake/future_lib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()