diff options
| author | Samuel Tan <samueltan@google.com> | 2015-09-16 18:24:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-16 18:24:15 +0000 |
| commit | 630e05b6af5f76bd7f063840e543186bde40ff0a (patch) | |
| tree | 42c814a9b71ac7619efa0d47b68cb55fef759095 /metricsd | |
| parent | ada7fa063e4d8e2b8014a138bdf58d7729ce0ee9 (diff) | |
| parent | 1c4d8f10daf692dd7eea64e4de5f909a3f99de08 (diff) | |
| download | core-630e05b6af5f76bd7f063840e543186bde40ff0a.tar.gz core-630e05b6af5f76bd7f063840e543186bde40ff0a.tar.bz2 core-630e05b6af5f76bd7f063840e543186bde40ff0a.zip | |
Merge "metricsd: move timer.h into include/metrics/"
Diffstat (limited to 'metricsd')
| -rw-r--r-- | metricsd/Android.mk | 3 | ||||
| -rw-r--r-- | metricsd/include/metrics/timer.h (renamed from metricsd/timer.h) | 0 | ||||
| -rw-r--r-- | metricsd/timer.cc | 2 | ||||
| -rw-r--r-- | metricsd/timer_mock.h | 2 | ||||
| -rw-r--r-- | metricsd/timer_test.cc | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/metricsd/Android.mk b/metricsd/Android.mk index c219ab1ad..8a0a8b4d9 100644 --- a/metricsd/Android.mk +++ b/metricsd/Android.mk @@ -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 diff --git a/metricsd/timer.h b/metricsd/include/metrics/timer.h index b36ffffc1..b36ffffc1 100644 --- a/metricsd/timer.h +++ b/metricsd/include/metrics/timer.h diff --git a/metricsd/timer.cc b/metricsd/timer.cc index 7b00cc074..0c2c119bf 100644 --- a/metricsd/timer.cc +++ b/metricsd/timer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "timer.h" +#include "metrics/timer.h" #include <string> diff --git a/metricsd/timer_mock.h b/metricsd/timer_mock.h index 8c9e8d89c..200ee9aab 100644 --- a/metricsd/timer_mock.h +++ b/metricsd/timer_mock.h @@ -21,7 +21,7 @@ #include <gmock/gmock.h> -#include "timer.h" +#include "metrics/timer.h" namespace chromeos_metrics { diff --git a/metricsd/timer_test.cc b/metricsd/timer_test.cc index ab027d462..432c3d20b 100644 --- a/metricsd/timer_test.cc +++ b/metricsd/timer_test.cc @@ -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::_; |