Fixes for packaging steps (#215)

 - Replaced std mutex with our own app mutex in app/src/heartbeat_date_storage_desktop.cc. - Removed heartbeat code from Android builds.

Author: DellaBitta

app/CMakeLists.txt

@@ -135,8 +135,6 @@ set(common_SRCS
  src/function_registry.cc
  src/future.cc
  src/future_manager.cc
- src/heartbeat_date_storage_desktop.cc
- src/heartbeat_info_desktop.cc
  src/path.cc
  src/reference_counted_future_impl.cc
  src/scheduler.cc
@@ -164,11 +162,15 @@ set(app_android_SRCS
 set(app_ios_SRCS
  src/app_ios.mm
  src/util_ios.mm
+ src/heartbeat_date_storage_desktop.cc
+ src/heartbeat_info_desktop.cc
  src/invites/ios/invites_receiver_internal_ios.mm
  src/invites/ios/invites_ios_startup.mm
  src/uuid_ios_darwin.mm)
 set(app_desktop_SRCS
  src/app_desktop.cc
+ src/heartbeat_date_storage_desktop.cc
+ src/heartbeat_info_desktop.cc
  src/invites/stub/invites_receiver_internal_stub.cc
  src/variant_util.cc)
 if(ANDROID)

app/src/heartbeat_date_storage_desktop.cc

@@ -19,6 +19,8 @@
 #include <fstream>
 #include <utility>
 
+#include <app/src/mutex.h>
+
 #include "app/src/filesystem.h"
 
 namespace FIREBASE_NAMESPACE {
@@ -29,8 +31,8 @@ const char kHeartbeatDir[] = "firebase-heartbeat";
 const char kHeartbeatFilename[] = "HEARTBEAT_INFO_STORAGE";
 
 // Returns the mutex that protects accesses to the storage file.
-std::mutex& FileMutex() {
- static std::mutex* mutex_ = new std::mutex();
+Mutex& FileMutex() {
+ static Mutex* mutex_ =  new Mutex(Mutex::kModeNonRecursive);
  return *mutex_;
 }
 
@@ -47,7 +49,7 @@ std::string GetFilename(std::string& error) {
 } // namespace
 
 HeartbeatDateStorage::HeartbeatDateStorage() : filename_(GetFilename(error_)) {
- std::lock_guard<std::mutex> lock(FileMutex());
+ MutexLock lock(FileMutex());
 
  // Ensure the file exists, otherwise the first attempt to read it would
  // fail.
@@ -69,7 +71,7 @@ bool HeartbeatDateStorage::ReadPersisted() {
 
  HeartbeatMap result;
 
- std::lock_guard<std::mutex> lock(FileMutex());
+ MutexLock lock(FileMutex());
 
  std::ifstream f(filename_);
  if (!f) {
@@ -102,7 +104,7 @@ bool HeartbeatDateStorage::ReadPersisted() {
 bool HeartbeatDateStorage::WritePersisted() const {
  if (!IsValid()) return false;
 
- std::lock_guard<std::mutex> lock(FileMutex());
+ MutexLock lock(FileMutex());
 
  std::ofstream f(filename_, std::ios_base::trunc);
  if (!f) {

app/src/heartbeat_date_storage_desktop.h

@@ -23,7 +23,6 @@
 
 #include <ctime>
 #include <map>
-#include <mutex> // NOLINT(build/c++11)
 #include <string>
 
 namespace FIREBASE_NAMESPACE {