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

Commit 28a78b72 authored by Samuel Tan's avatar Samuel Tan
Browse files

metricsd: move timer_mock.h and metrics_library_mock.h into include/metrics/ 

Move metrics_library_mock.h and timer_mock.h into the include/metrics/
folder since some source files in shill need to include these header files.

Adjust the include paths in metricsd source files accordingly, and add
the -frtti flag to the libmetrics target so that classes including
these mock headers can determine the type information of the underlying
class being mocked at run-time.

BUG: 22956441
Change-Id: I19820c0d3097c9c4c2b93730d1988ccec563db23
TEST: "mma" in metricsd folder succeeds.
parent e4975da3

metricsd/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ LOCAL_CFLAGS := $(metrics_CFLAGS) 
LOCAL_CLANG := true

LOCAL_CPP_EXTENSION := $(metrics_cpp_extension)

LOCAL_CPPFLAGS := $(metrics_CPPFLAGS)

LOCAL_RTTI_FLAG := -frtti

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_SHARED_LIBRARIES := $(metrics_shared_libraries)

LOCAL_SRC_FILES := $(libmetrics_sources)

metricsd/metrics_daemon_test.cc

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


#include "constants.h"

#include "metrics_daemon.h"

#include "metrics_library_mock.h"

#include "metrics/metrics_library_mock.h"

#include "persistent_integer_mock.h"



using base::FilePath;

metricsd/timer_test.cc

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

#include <gtest/gtest.h>



#include "metrics/metrics_library_mock.h"

#include "metrics/timer.h"

#include "metrics_library_mock.h"

#include "timer_mock.h"

#include "metrics/timer_mock.h"



using ::testing::_;

using ::testing::Return;