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:
@@ -22,9 +22,9 @@
|
||||
#include "hidl_metrics_adapter.h"
|
||||
#include "mapErrors-inl.h"
|
||||
#include "media/stagefright/MediaErrors.h"
|
||||
#include "metrics.pb.h"
|
||||
#include "openssl/sha.h"
|
||||
#include "wv_cdm_constants.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
namespace {
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "hidl_metrics_adapter.h"
|
||||
|
||||
#include <android/hardware/drm/1.1/types.h>
|
||||
#include "metrics.pb.h"
|
||||
#include "wv_metrics.pb.h"
|
||||
|
||||
using android::hardware::hidl_vec;
|
||||
using android::hardware::drm::V1_1::DrmMetricGroup;
|
||||
|
||||
Reference in New Issue
Block a user