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:
@@ -13,12 +13,12 @@
|
||||
#include "initialization_data.h"
|
||||
#include "license.h"
|
||||
#include "log.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "properties.h"
|
||||
#include "service_certificate.h"
|
||||
#include "string_conversions.h"
|
||||
#include "wv_cdm_constants.h"
|
||||
#include "wv_cdm_event_listener.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
namespace {
|
||||
const int kCdmTimerDurationSeconds = 1;
|
||||
|
||||
Reference in New Issue
Block a user