Widevine HAL must not access mediametrics binder service.

am: 54061a8bb8

Change-Id: I3832883c9c20ae248b4501e12b4586f193f60c71

libwvdrmengine/Android.mk

@@ -149,7 +149,6 @@ LOCAL_SHARED_LIBRARIES := \
   libcutils \
   libdl \
   liblog \
-  libmedia \
   libprotobuf-cpp-lite \
   libstagefright_foundation \
   libutils \
@@ -217,7 +216,6 @@ LOCAL_SHARED_LIBRARIES := \
   libhidlmemory \
   libhwbinder \
   liblog \
-  libmedia \
   libprotobuf-cpp-lite \
   libstagefright_foundation \
   libutils \

libwvdrmengine/cdm/Android.mk

@@ -36,7 +36,6 @@ LOCAL_SRC_FILES := \
     $(CORE_SRC_DIR)/privacy_crypto_openssl.cpp \
     $(CORE_SRC_DIR)/service_certificate.cpp \
     $(CORE_SRC_DIR)/usage_table_header.cpp \
-    $(SRC_DIR)/ami_adapter.cpp \
     $(SRC_DIR)/wv_content_decryption_module.cpp \
     $(METRICS_SRC_DIR)/distribution.cpp \
     $(METRICS_SRC_DIR)/event_metric.cpp \

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -2,7 +2,6 @@
 
 #include "wv_content_decryption_module.h"
 
-#include "ami_adapter.h"
 #include "cdm_client_property_set.h"
 #include "cdm_engine.h"
 #include "initialization_data.h"
@@ -23,7 +22,9 @@ namespace wvcdm {
 Lock WvContentDecryptionModule::session_sharing_id_generation_lock_;
 
 WvContentDecryptionModule::WvContentDecryptionModule() {
-  report_root_ = new AmiAdapter();
+  // TODO (b/36497276)
+  // replace call to new AmiAdapter() and remove ami_apdater.*
+  report_root_ = NULL; // new AmiAdapter();
   front_end_ = new metrics::MetricsFrontEnd(report_root_);
   metrics::MetricsFrontEnd::OverrideInstance(front_end_);
 }