Refactor platform selection to use platform.h macros,

FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS, FIREBASE_PLATFORM_WINDOWS, etc.

PiperOrigin-RevId: 264702710

Author: jonsimantov

admob/src/common/banner_view_internal.cc

@@ -15,22 +15,20 @@
  */
 
 #include "admob/src/common/banner_view_internal.h"
+
 #include "admob/src/include/firebase/admob/banner_view.h"
 #include "app/src/include/firebase/future.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/mutex.h"
 #include "app/src/reference_counted_future_impl.h"
 
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif  // __APPLE__
-
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 #include "admob/src/android/banner_view_internal_android.h"
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
 #include "admob/src/ios/banner_view_internal_ios.h"
 #else
 #include "admob/src/stub/banner_view_internal_stub.h"
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 namespace firebase {
 namespace admob {
@@ -40,13 +38,13 @@ BannerViewInternal::BannerViewInternal(BannerView* base)
     : base_(base), future_data_(kBannerViewFnCount), listener_(nullptr) {}
 
 BannerViewInternal* BannerViewInternal::CreateInstance(BannerView* base) {
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
   return new BannerViewInternalAndroid(base);
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
   return new BannerViewInternalIOS(base);
 #else
   return new BannerViewInternalStub(base);
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 }
 
 void BannerViewInternal::SetListener(BannerView::Listener* listener) {

admob/src/common/interstitial_ad_internal.cc

@@ -15,22 +15,20 @@
  */
 
 #include "admob/src/common/interstitial_ad_internal.h"
+
 #include "admob/src/include/firebase/admob/interstitial_ad.h"
 #include "app/src/include/firebase/future.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/mutex.h"
 #include "app/src/reference_counted_future_impl.h"
 
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif  // __APPLE__
-
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 #include "admob/src/android/interstitial_ad_internal_android.h"
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
 #include "admob/src/ios/interstitial_ad_internal_ios.h"
 #else
 #include "admob/src/stub/interstitial_ad_internal_stub.h"
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 namespace firebase {
 namespace admob {
@@ -41,13 +39,13 @@ InterstitialAdInternal::InterstitialAdInternal(InterstitialAd* base)
 
 InterstitialAdInternal* InterstitialAdInternal::CreateInstance(
     InterstitialAd* base) {
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
   return new InterstitialAdInternalAndroid(base);
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
   return new InterstitialAdInternalIOS(base);
 #else
   return new InterstitialAdInternalStub(base);
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 }
 
 void InterstitialAdInternal::SetListener(InterstitialAd::Listener* listener) {

admob/src/common/native_express_ad_view_internal.cc

@@ -15,22 +15,20 @@
  */
 
 #include "admob/src/common/native_express_ad_view_internal.h"
+
 #include "admob/src/include/firebase/admob/native_express_ad_view.h"
 #include "app/src/include/firebase/future.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/mutex.h"
 #include "app/src/reference_counted_future_impl.h"
 
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif  // __APPLE__
-
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 #include "admob/src/android/native_express_ad_view_internal_android.h"
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
 #include "admob/src/ios/native_express_ad_view_internal_ios.h"
 #else
 #include "admob/src/stub/native_express_ad_view_internal_stub.h"
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 namespace firebase {
 namespace admob {
@@ -44,13 +42,13 @@ NativeExpressAdViewInternal::NativeExpressAdViewInternal(
 
 NativeExpressAdViewInternal* NativeExpressAdViewInternal::CreateInstance(
     NativeExpressAdView* base) {
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
   return new NativeExpressAdViewInternalAndroid(base);
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
   return new NativeExpressAdViewInternalIOS(base);
 #else
   return new NativeExpressAdViewInternalStub(base);
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 }
 
 void NativeExpressAdViewInternal::SetListener(

admob/src/common/rewarded_video_internal.cc

@@ -15,22 +15,20 @@
  */
 
 #include "admob/src/common/rewarded_video_internal.h"
+
 #include "admob/src/include/firebase/admob/rewarded_video.h"
 #include "app/src/include/firebase/future.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/mutex.h"
 #include "app/src/reference_counted_future_impl.h"
 
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif  // __APPLE__
-
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 #include "admob/src/android/rewarded_video_internal_android.h"
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
 #include "admob/src/ios/rewarded_video_internal_ios.h"
 #else
 #include "admob/src/stub/rewarded_video_internal_stub.h"
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 namespace firebase {
 namespace admob {
@@ -41,13 +39,13 @@ RewardedVideoInternal::RewardedVideoInternal()
     : future_data_(kRewardedVideoFnCount), listener_(nullptr) {}
 
 RewardedVideoInternal* RewardedVideoInternal::CreateInstance() {
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
   return new RewardedVideoInternalAndroid();
-#elif TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
   return new RewardedVideoInternalIOS();
 #else
   return new RewardedVideoInternalStub();
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 }
 
 void RewardedVideoInternal::SetListener(Listener* listener) {

admob/src/include/firebase/admob.h

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_H_
+#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
 
-#ifdef __ANDROID__
+#include "firebase/internal/platform.h"
+
+#if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>
-#endif  // __ANDROID__
+#endif  // FIREBASE_PLATFORM_ANDROID
 
 #include "firebase/admob/banner_view.h"
 #include "firebase/admob/interstitial_ad.h"
@@ -69,7 +71,7 @@ InitResult Initialize(const ::firebase::App& app);
 /// Google Play services (for example, when using 'play-services-ads-lite').
 InitResult Initialize(const ::firebase::App& app, const char* admob_app_id);
 
-#if defined(__ANDROID__) || defined(DOXYGEN)
+#if FIREBASE_PLATFORM_ANDROID || defined(DOXYGEN)
 /// Initializes AdMob without Firebase for Android.
 ///
 /// The arguments to @ref Initialize are platform-specific so the caller must do
@@ -122,7 +124,7 @@ InitResult Initialize(JNIEnv* jni_env, jobject activity);
 InitResult Initialize(JNIEnv* jni_env, jobject activity,
                       const char* admob_app_id);
 #endif  // defined(__ANDROID__) || defined(DOXYGEN)
-#if !defined(__ANDROID__) || defined(DOXYGEN)
+#if !FIREBASE_PLATFORM_ANDROID || defined(DOXYGEN)
 /// Initializes AdMob without Firebase for iOS.
 InitResult Initialize();
 
@@ -152,4 +154,4 @@ void Terminate();
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_H_
+#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_

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

@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_TYPES_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
 
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif  // __APPLE__
+#include "firebase/internal/platform.h"
 
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>
-#elif defined(TARGET_OS_IPHONE)
+#elif FIREBASE_PLATFORM_IOS
 extern "C" {
 #include <objc/objc.h>
 }  // extern "C"
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 namespace firebase {
 namespace admob {
@@ -39,16 +37,16 @@ namespace admob {
 ///   <li>Android: A `jobject` which references an Android Activity.</li>
 ///   <li>iOS: An `id` which references an iOS UIView.</li>
 /// </ul>
-#if defined(__ANDROID__)
+#if FIREBASE_PLATFORM_ANDROID
 /// An Android Activity from Java.
 typedef jobject AdParent;
-#elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#elif FIREBASE_PLATFORM_IOS
 /// A pointer to an iOS UIView.
 typedef id AdParent;
 #else
 /// A void pointer for stub classes.
 typedef void *AdParent;
-#endif  // __ANDROID__, TARGET_OS_IPHONE
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
 
 #ifdef INTERNAL_EXPERIMENTAL
 // LINT.IfChange
@@ -175,4 +173,4 @@ struct BoundingBox {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_

app/rest/request_file.cc

@@ -16,18 +16,21 @@
 
 #include "app/rest/request_file.h"
 
+#include "app/src/include/firebase/internal/platform.h"
+
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif  // _FILE_OFFSET_BITS
 #include <stdio.h>
+
 #include <cassert>
 #include <cstddef>
 
 // Map to POSIX compliant fseek on Windows.
-#ifdef _WIN32
+#if FIREBASE_PLATFORM_WINDOWS
 #define fseeko _fseeki64
 #define ftello _ftelli64
-#endif  // _WIN32
+#endif  // FIREBASE_PLATFORM_WINDOWS
 
 namespace firebase {
 namespace rest {

app/rest/transport_curl.cc

@@ -23,17 +23,18 @@
 #include "app/rest/controller_curl.h"
 #include "app/rest/util.h"
 #include "app/src/assert.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/mutex.h"
 #include "app/src/semaphore.h"
 #include "app/src/thread.h"
 #include "app/src/util.h"
 #include "curl/curl.h"
 
-#ifdef _WIN32
+#if FIREBASE_PLATFORM_WINDOWS
 #include "Winsock2.h"
 #else
 #include <sys/select.h>
-#endif  // _WIN32
+#endif  // FIREBASE_PLATFORM_WINDOWS
 
 namespace firebase {
 namespace rest {
@@ -560,8 +561,8 @@ bool BackgroundTransportCurl::PerformBackground(Request* request) {
                              options.post_fields.c_str()),
             "set http post fields");
     if (controller_) {
-      controller_->set_transfer_size(static_cast<int64_t>(
-          options.post_fields.size()));
+      controller_->set_transfer_size(
+          static_cast<int64_t>(options.post_fields.size()));
     }
   }
 

app/src/app_common.cc

@@ -24,23 +24,20 @@
 #include <utility>  // Used to detect STL variant.
 #include <vector>
 
-#ifdef __APPLE__
-#include "TargetConditionals.h"
-#endif  // __APPLE__
-
 #include "app/memory/unique_ptr.h"
 #include "app/src/assert.h"
 #include "app/src/callback.h"
 #include "app/src/cleanup_notifier.h"
 #include "app/src/include/firebase/app.h"
+#include "app/src/include/firebase/internal/platform.h"
 #include "app/src/include/firebase/version.h"
 #include "app/src/mutex.h"
 #include "app/src/util.h"
 
 // strtok_r is strtok_s on Windows.
-#if defined(_WIN32)
+#if FIREBASE_PLATFORM_WINDOWS
 #define strtok_r strtok_s
-#endif  // defined(_WIN32)
+#endif  // FIREBASE_PLATFORM_WINDOWS
 
 #if !defined(FIREBASE_NAMESPACE)
 #define FIREBASE_NAMESPACE firebase
@@ -55,7 +52,7 @@ namespace app_common {
 
 // clang-format=off
 // Detect operating system and architecture.
-#if defined(_MSVC_VER) || defined(_WIN32)
+#if FIREBASE_PLATFORM_WINDOWS
 
 const char* kOperatingSystem = "windows";
 #if defined(_DLL) && _DLL == 1
@@ -79,9 +76,9 @@ const char* kCpuArchitecture = "arm32";
 
 #elif defined(__APPLE__)
 const char* kCppRuntimeOrStl = "libcpp";
-#if TARGET_OS_IOS
+#if FIREBASE_PLATFORM_IOS
 const char* kOperatingSystem = "ios";
-#elif TARGET_OS_OSX
+#elif FIREBASE_PLATFORM_OSX
 const char* kOperatingSystem = "darwin";
 #else
 #error Unknown Apple operating system.
@@ -99,7 +96,7 @@ const char* kCpuArchitecture = "arm32";
 #error Unknown Apple architecture.
 #endif  // Architecture
 
-#elif __ANDROID__
+#elif FIREBASE_PLATFORM_ANDROID
 const char* kOperatingSystem = "android";
 
 #if __i386__
@@ -132,7 +129,7 @@ const char* kCppRuntimeOrStl = "libcpp";
 #error Unknown Android STL.
 #endif  // STL
 
-#elif __linux__
+#elif FIREBASE_PLATFORM_LINUX
 const char* kOperatingSystem = "linux";
 const char* kCppRuntimeOrStl = "gnustl";