ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am cd27f8a1: Merge "metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/"

Browse source 
* commit 'cd27f8a1980de7af748c22a24efd691f19cae4e2':
  metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/
This commit is contained in:
Samuel Tan 2015-09-24 17:45:57 +00:00 • committed by Android Git Automerger
commit dc74e900d6
6 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
metricsd/Android.mk
View file

@ -88,6 +88,7 @@ LOCAL_CFLAGS := $(metrics_CFLAGS)
LOCAL_CLANG := true LOCAL_CLANG := true
LOCAL_CPP_EXTENSION := $(metrics_cpp_extension) LOCAL_CPP_EXTENSION := $(metrics_cpp_extension)
LOCAL_CPPFLAGS := $(metrics_CPPFLAGS) LOCAL_CPPFLAGS := $(metrics_CPPFLAGS)
LOCAL_RTTI_FLAG := -frtti
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_SHARED_LIBRARIES := $(metrics_shared_libraries) LOCAL_SHARED_LIBRARIES := $(metrics_shared_libraries)
LOCAL_SRC_FILES := $(libmetrics_sources) LOCAL_SRC_FILES := $(libmetrics_sources)

0
metricsd/metrics_library_mock.h → metricsd/include/metrics/metrics_library_mock.h
View file

0
metricsd/timer_mock.h → metricsd/include/metrics/timer_mock.h
View file

2
metricsd/metrics_daemon_test.cc
View file

@ -30,7 +30,7 @@
#include "constants.h" #include "constants.h"
#include "metrics_daemon.h" #include "metrics_daemon.h"
#include "metrics_library_mock.h" #include "metrics/metrics_library_mock.h"
#include "persistent_integer_mock.h" #include "persistent_integer_mock.h"
using base::FilePath; using base::FilePath;

4
metricsd/timer_test.cc
View file

@ -20,9 +20,9 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "metrics/metrics_library_mock.h"
#include "metrics/timer.h" #include "metrics/timer.h"
#include "metrics_library_mock.h" #include "metrics/timer_mock.h"
#include "timer_mock.h"
using ::testing::_; using ::testing::_;
using ::testing::Return; using ::testing::Return;

2
metricsd/uploader/upload_service_test.cc
View file

@ -23,7 +23,7 @@
#include <base/sys_info.h> #include <base/sys_info.h>
#include "constants.h" #include "constants.h"
#include "metrics_library_mock.h" #include "metrics/metrics_library_mock.h"
#include "persistent_integer.h" #include "persistent_integer.h"
#include "serialization/metric_sample.h" #include "serialization/metric_sample.h"
#include "uploader/metrics_log.h" #include "uploader/metrics_log.h"