Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 492c0035 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Use GetBuildTime from libchrome instead of __DATE__" am: 4d18ae93 

am: 529fa186

* commit '529fa186':
  Use GetBuildTime from libchrome instead of __DATE__
parents 0dac031b 529fa186

metricsd/uploader/metrics_log_base.cc

+2 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




#include "uploader/metrics_log_base.h"

#include "uploader/metrics_log_base.h"





#include "base/build_time.h"

#include "base/metrics/histogram_base.h"

#include "base/metrics/histogram_base.h"

#include "base/metrics/histogram_samples.h"

#include "base/metrics/histogram_samples.h"

#include "uploader/metrics_hashes.h"

#include "uploader/metrics_hashes.h"
@@ -82,10 +83,7 @@ uint64_t MetricsLogBase::Hash(const std::string& value) { 
int64_t MetricsLogBase::GetBuildTime() {

int64_t MetricsLogBase::GetBuildTime() {

  static int64_t integral_build_time = 0;

  static int64_t integral_build_time = 0;

  if (!integral_build_time) {

  if (!integral_build_time) {

    Time time;

    Time time = base::GetBuildTime();

    const char* kDateTime = __DATE__ " " __TIME__ " GMT";

    bool result = Time::FromString(kDateTime, &time);

    DCHECK(result);

    integral_build_time = static_cast<int64_t>(time.ToTimeT());

    integral_build_time = static_cast<int64_t>(time.ToTimeT());

  }

  }

  return integral_build_time;

  return integral_build_time;