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

Commit 98a69a06 authored by Samuel Tan's avatar Samuel Tan Committed by Android Git Automerger
Browse files

am 630e05b6: Merge "metricsd: move timer.h into include/metrics/" 

* commit '630e05b6':
  metricsd: move timer.h into include/metrics/
parents f656b683 630e05b6

metricsd/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ libmetrics_sources := \ 
  c_metrics_library.cc \

  metrics_library.cc \

  serialization/metric_sample.cc \

  serialization/serialization_utils.cc

  serialization/serialization_utils.cc \

  timer.cc



metrics_client_sources := \

  metrics_client.cc

metricsd/timer.h→metricsd/include/metrics/timer.h

+0 −0

File moved.

View file

metricsd/timer.cc

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include "timer.h"

#include "metrics/timer.h"



#include <string>

metricsd/timer_mock.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#include <gmock/gmock.h>



#include "timer.h"

#include "metrics/timer.h"



namespace chromeos_metrics {

metricsd/timer_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include "metrics/timer.h"

#include "metrics_library_mock.h"

#include "timer.h"

#include "timer_mock.h"



using ::testing::_;