Integrate Latest @ 128938142

jonsimantov · jonsimantov · commit db3e94949b0e · 2016-07-31T13:54:42.000-07:00
- Don't include google_play_services/availability.h header in samples on iOS.

CL: 128938142
diff --git a/auth/testapp/src/common_main.cc b/auth/testapp/src/common_main.cc
@@ -19,7 +19,9 @@
 
 #include "firebase/app.h"
 #include "firebase/auth.h"
+#if defined(__ANDROID__)
 #include "google_play_services/availability.h"
+#endif  // defined(__ANDROID__)
 
 // Thin OS abstraction layer.
 #include "main.h"  // NOLINT
@@ -220,7 +222,7 @@ class UserLogin {
 extern "C" int common_main(int argc, const char* argv[]) {
   App* app;
   LogMessage("Starting Auth tests.");
-  // Create the App wrapper.
+// Create the App wrapper.
 
 #if defined(__ANDROID__)
   app = App::Create(AppOptions(), GetJniEnv(), GetActivity());
diff --git a/invites/testapp/src/common_main.cc b/invites/testapp/src/common_main.cc
@@ -15,7 +15,9 @@
 #include "firebase/app.h"
 #include "firebase/future.h"
 #include "firebase/invites.h"
+#if defined(__ANDROID__)
 #include "google_play_services/availability.h"
+#endif  // defined(__ANDROID__)
 
 // Thin OS abstraction layer.
 #include "main.h"  // NOLINT
diff --git a/messaging/testapp/src/common_main.cc b/messaging/testapp/src/common_main.cc
@@ -14,7 +14,9 @@
 
 #include "firebase/app.h"
 #include "firebase/messaging.h"
+#if defined(__ANDROID__)
 #include "google_play_services/availability.h"
+#endif  // defined(__ANDROID__)
 
 // Thin OS abstraction layer.
 #include "main.h"  // NOLINT
diff --git a/remote_config/testapp/src/common_main.cc b/remote_config/testapp/src/common_main.cc
@@ -16,7 +16,9 @@
 
 #include "firebase/app.h"
 #include "firebase/remote_config.h"
+#if defined(__ANDROID__)
 #include "google_play_services/availability.h"
+#endif  // defined(__ANDROID__)
 
 // Thin OS abstraction layer.
 #include "main.h"  // NOLINT
