Rename metrics.proto to wv_metrics.proto.
Merge from http://go/wvgerrit/105767 To avoid conflict with metrics.proto in frameworks/av/drm/libmediadrm/proto. This is in preparation of moving metrics_dump tool to build under Android. bug: 161783052 Test: unit test Test: Play Movies & Tv and Netflix streaming Change-Id: I2406b66db4d61cca7c6260ea8847a555d96c8d42
This commit is contained in:
@@ -15,8 +15,8 @@
|
||||
#include "cdm_engine.h"
|
||||
#include "gmock/gmock.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "wv_cdm_event_listener.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
using ::testing::_;
|
||||
using ::testing::ByRef;
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#include "initialization_data.h"
|
||||
#include "license_request.h"
|
||||
#include "log.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "properties.h"
|
||||
#include "string_conversions.h"
|
||||
#include "test_base.h"
|
||||
@@ -27,6 +26,7 @@
|
||||
#include "url_request.h"
|
||||
#include "wv_cdm_constants.h"
|
||||
#include "wv_cdm_types.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
namespace wvcdm {
|
||||
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
|
||||
#include "cdm_session.h"
|
||||
#include "crypto_key.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "properties.h"
|
||||
#include "service_certificate.h"
|
||||
#include "string_conversions.h"
|
||||
@@ -17,6 +16,7 @@
|
||||
#include "test_printers.h"
|
||||
#include "usage_table_header.h"
|
||||
#include "wv_cdm_constants.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
using ::testing::_;
|
||||
using ::testing::DoAll;
|
||||
|
||||
@@ -12,12 +12,12 @@
|
||||
#include "key_session.h"
|
||||
#include "license_protocol.pb.h"
|
||||
#include "log.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "metrics_collections.h"
|
||||
#include "platform.h"
|
||||
#include "test_base.h"
|
||||
#include "test_printers.h"
|
||||
#include "wv_cdm_types.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user