Skip to content

Commit bc4905d

Browse files
committed
new platform preprocessor constant FIREBASE_PLATFORM_TVOS
1 parent 0092bba commit bc4905d

29 files changed

+93
-89
lines changed

admob/src/common/banner_view_internal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
#if FIREBASE_PLATFORM_ANDROID
2626
#include "admob/src/android/banner_view_internal_android.h"
27-
#elif FIREBASE_PLATFORM_IOS
27+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2828
#include "admob/src/ios/banner_view_internal_ios.h"
2929
#else
3030
#include "admob/src/stub/banner_view_internal_stub.h"
31-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
31+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
3232

3333
namespace firebase {
3434
namespace admob {
@@ -40,11 +40,11 @@ BannerViewInternal::BannerViewInternal(BannerView* base)
4040
BannerViewInternal* BannerViewInternal::CreateInstance(BannerView* base) {
4141
#if FIREBASE_PLATFORM_ANDROID
4242
return new BannerViewInternalAndroid(base);
43-
#elif FIREBASE_PLATFORM_IOS
43+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
4444
return new BannerViewInternalIOS(base);
4545
#else
4646
return new BannerViewInternalStub(base);
47-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
47+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
4848
}
4949

5050
void BannerViewInternal::SetListener(BannerView::Listener* listener) {

admob/src/common/interstitial_ad_internal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
#if FIREBASE_PLATFORM_ANDROID
2626
#include "admob/src/android/interstitial_ad_internal_android.h"
27-
#elif FIREBASE_PLATFORM_IOS
27+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2828
#include "admob/src/ios/interstitial_ad_internal_ios.h"
2929
#else
3030
#include "admob/src/stub/interstitial_ad_internal_stub.h"
31-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
31+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
3232

3333
namespace firebase {
3434
namespace admob {
@@ -41,11 +41,11 @@ InterstitialAdInternal* InterstitialAdInternal::CreateInstance(
4141
InterstitialAd* base) {
4242
#if FIREBASE_PLATFORM_ANDROID
4343
return new InterstitialAdInternalAndroid(base);
44-
#elif FIREBASE_PLATFORM_IOS
44+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
4545
return new InterstitialAdInternalIOS(base);
4646
#else
4747
return new InterstitialAdInternalStub(base);
48-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
48+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
4949
}
5050

5151
void InterstitialAdInternal::SetListener(InterstitialAd::Listener* listener) {

admob/src/common/native_express_ad_view_internal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
#if FIREBASE_PLATFORM_ANDROID
2626
#include "admob/src/android/native_express_ad_view_internal_android.h"
27-
#elif FIREBASE_PLATFORM_IOS
27+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2828
#include "admob/src/ios/native_express_ad_view_internal_ios.h"
2929
#else
3030
#include "admob/src/stub/native_express_ad_view_internal_stub.h"
31-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
31+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
3232

3333
namespace firebase {
3434
namespace admob {
@@ -44,11 +44,11 @@ NativeExpressAdViewInternal* NativeExpressAdViewInternal::CreateInstance(
4444
NativeExpressAdView* base) {
4545
#if FIREBASE_PLATFORM_ANDROID
4646
return new NativeExpressAdViewInternalAndroid(base);
47-
#elif FIREBASE_PLATFORM_IOS
47+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
4848
return new NativeExpressAdViewInternalIOS(base);
4949
#else
5050
return new NativeExpressAdViewInternalStub(base);
51-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
51+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
5252
}
5353

5454
void NativeExpressAdViewInternal::SetListener(

admob/src/common/rewarded_video_internal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
#if FIREBASE_PLATFORM_ANDROID
2626
#include "admob/src/android/rewarded_video_internal_android.h"
27-
#elif FIREBASE_PLATFORM_IOS
27+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2828
#include "admob/src/ios/rewarded_video_internal_ios.h"
2929
#else
3030
#include "admob/src/stub/rewarded_video_internal_stub.h"
31-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
31+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
3232

3333
namespace firebase {
3434
namespace admob {
@@ -41,11 +41,11 @@ RewardedVideoInternal::RewardedVideoInternal()
4141
RewardedVideoInternal* RewardedVideoInternal::CreateInstance() {
4242
#if FIREBASE_PLATFORM_ANDROID
4343
return new RewardedVideoInternalAndroid();
44-
#elif FIREBASE_PLATFORM_IOS
44+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
4545
return new RewardedVideoInternalIOS();
4646
#else
4747
return new RewardedVideoInternalStub();
48-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
48+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
4949
}
5050

5151
void RewardedVideoInternal::SetListener(Listener* listener) {

admob/src/include/firebase/admob/types.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
#if FIREBASE_PLATFORM_ANDROID
2323
#include <jni.h>
24-
#elif FIREBASE_PLATFORM_IOS
24+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2525
extern "C" {
2626
#include <objc/objc.h>
2727
} // extern "C"
28-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
28+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
2929

3030
namespace firebase {
3131
namespace admob {
@@ -40,13 +40,13 @@ namespace admob {
4040
#if FIREBASE_PLATFORM_ANDROID
4141
/// An Android Activity from Java.
4242
typedef jobject AdParent;
43-
#elif FIREBASE_PLATFORM_IOS
43+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
4444
/// A pointer to an iOS UIView.
4545
typedef id AdParent;
4646
#else
4747
/// A void pointer for stub classes.
4848
typedef void *AdParent;
49-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
49+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
5050

5151
#ifdef INTERNAL_EXPERIMENTAL
5252
// LINT.IfChange

app/src/app_common.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const char* kCpuArchitecture = "arm32";
8888

8989
#elif defined(__APPLE__)
9090
const char* kCppRuntimeOrStl = "libcpp";
91-
#if FIREBASE_PLATFORM_IOS
91+
#if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
9292
const char* kOperatingSystem = "ios";
9393
#elif FIREBASE_PLATFORM_OSX
9494
const char* kOperatingSystem = "darwin";

app/src/include/firebase/app.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <map>
2727
#include <string>
2828

29-
#if FIREBASE_PLATFORM_IOS
29+
#if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
3030
#ifdef __OBJC__
3131
@class FIRApp;
3232
#endif // __OBJC__
@@ -718,14 +718,14 @@ class App {
718718
/// @return Global reference to the FirebaseApp. The returned reference
719719
/// most be deleted after use.
720720
jobject GetPlatformApp() const;
721-
#elif FIREBASE_PLATFORM_IOS
721+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
722722
#ifdef __OBJC__
723723
/// Get the platform specific app implementation referenced by this object.
724724
///
725725
/// @return Reference to the FIRApp object owned by this app.
726726
FIRApp* GetPlatformApp() const;
727727
#endif // __OBJC__
728-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
728+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
729729
#endif // INTERNAL_EXPERIMENTAL
730730

731731
private:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636

3737
#define FIREBASE_PLATFORM_ANDROID 0
3838
#define FIREBASE_PLATFORM_IOS 0
39+
#define FIREBASE_PLATFORM_TVOS 0
3940
#define FIREBASE_PLATFORM_OSX 0
4041
#define FIREBASE_PLATFORM_WINDOWS 0
4142
#define FIREBASE_PLATFORM_LINUX 0
@@ -51,6 +52,9 @@
5152
#elif defined(TARGET_OS_IOS) && TARGET_OS_IOS
5253
#undef FIREBASE_PLATFORM_IOS
5354
#define FIREBASE_PLATFORM_IOS 1
55+
#elif defined(TARGET_OS_TV) && TARGET_OS_TV
56+
#undef FIREBASE_PLATFORM_TVOS
57+
#define FIREBASE_PLATFORM_TVOS 1
5458
#elif defined(TARGET_OS_OSX) && TARGET_OS_OSX
5559
#undef FIREBASE_PLATFORM_OSX
5660
#define FIREBASE_PLATFORM_OSX 1

app/src/invites/invites_receiver_internal.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
#include "app/src/reference_counted_future_impl.h"
2727
#if FIREBASE_PLATFORM_ANDROID
2828
#include "app/src/invites/android/invites_receiver_internal_android.h"
29-
#elif FIREBASE_PLATFORM_IOS
29+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
3030
#include "app/src/invites/ios/invites_receiver_internal_ios.h"
3131
#else
3232
#include "app/src/invites/stub/invites_receiver_internal_stub.h"
33-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
33+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
3434

3535
namespace firebase {
3636
namespace invites {
@@ -55,11 +55,11 @@ InvitesReceiverInternal* InvitesReceiverInternal::CreateInstance(
5555
if (!receiver) {
5656
#if FIREBASE_PLATFORM_ANDROID
5757
receiver = new InvitesReceiverInternalAndroid(app);
58-
#elif FIREBASE_PLATFORM_IOS
58+
#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
5959
receiver = new InvitesReceiverInternalIos(app);
6060
#else
6161
receiver = new InvitesReceiverInternalStub(app);
62-
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
62+
#endif // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_TVOS
6363
if (!receiver->initialized()) {
6464
delete receiver;
6565
return nullptr;

app/src/locale.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "app/src/include/firebase/internal/platform.h"
2020
#include "app/src/log.h"
2121

22-
#if FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS
22+
#if FIREBASE_PLATFORM_OSX || FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
2323
#error "This file does not support iOS and OS X, use locale_apple.mm instead."
2424
#elif FIREBASE_PLATFORM_ANDROID
2525
#error "This file is not support on Android."

0 commit comments

Comments
 (0)