Fix API support for Widevine vendor metrics

This fixes Widevine's getMetrics call so that it will return vendor
metrics through the Drm plugin 1.1 interface.

Bug: 73724453
Test: New and existing unit tests. Updated and existing GTS. Google Play manual.

Change-Id: Ie35128dc80bd6eabf9e1f3b9c1800256af77bc51

libwvdrmengine/mediadrm/test/Android.mk

@@ -120,3 +120,63 @@ LOCAL_MODULE_TARGET_ARCH := arm x86 mips
 endif
 
 include $(BUILD_EXECUTABLE)
+
+# -----------------------------------------------------------------------------
+# Builds hidl_metrics_adapter_unittest
+#
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+  hidl_metrics_adapter_unittest.cpp \
+
+LOCAL_C_INCLUDES := \
+  vendor/widevine/libwvdrmengine/cdm/core/include \
+  vendor/widevine/libwvdrmengine/cdm/include \
+  vendor/widevine/libwvdrmengine/cdm/metrics/include \
+  vendor/widevine/libwvdrmengine/include_hidl \
+  vendor/widevine/libwvdrmengine/include \
+  vendor/widevine/libwvdrmengine/mediadrm/include_hidl \
+  vendor/widevine/libwvdrmengine/mediadrm/include \
+  vendor/widevine/libwvdrmengine/oemcrypto/include \
+
+LOCAL_STATIC_LIBRARIES := \
+  libcdm \
+  libcdm_protos \
+  libcdm_utils \
+  libgtest \
+  libgtest_main \
+  libwvdrmdrmplugin_hidl \
+  libcrypto \
+  libjsmn \
+  libwvlevel3 \
+  libwvdrmdrmplugin_hidl \
+
+LOCAL_SHARED_LIBRARIES := \
+  android.hardware.drm@1.0 \
+  android.hardware.drm@1.1 \
+  android.hidl.memory@1.0 \
+  libhidlbase \
+  libhidlmemory \
+  libhidltransport \
+  liblog \
+  libprotobuf-cpp-lite \
+
+LOCAL_C_INCLUDES += \
+  external/protobuf/src \
+
+LOCAL_MODULE := hidl_metrics_adapter_unittest
+
+LOCAL_MODULE_TAGS := tests
+
+LOCAL_MODULE_OWNER := widevine
+LOCAL_PROPRIETARY_MODULE := true
+
+# When built, explicitly put it in the DATA/bin directory.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/bin
+
+ifneq ($(TARGET_ENABLE_MEDIADRM_64), true)
+LOCAL_MODULE_TARGET_ARCH := arm x86 mips
+endif
+
+include $(BUILD_EXECUTABLE)
+