commit fb679e38bbc91614faa917024adddeb51ff07d0a
author Adam Stone <blueeyes@google.com> Wed Feb 07 10:25:48 2018 -0800
committer Adam Stone <blueeyes@google.com> Tue Feb 13 12:57:37 2018 -0800
tree 71c39782f7a5378ab9f383d31e053bff59ef41d2
parent 8cc97b178bc6c744eaeef526eca7a4e3f24a1a0e

Add logging support for FW metrics

Adds proto serialization and logging support for media drm framework metrics.

Bug: 64001676

Test: Ran CTS tests, unit tests and Google Play.
Change-Id: Ie350ac93caa6b35610eb63e4acc860c8e8a5cf5b

drm/libmediadrm/tests/Android.bp

diff --git a/drm/libmediadrm/tests/Android.bp b/drm/libmediadrm/tests/Android.bp
index b508c59..670d3b9 100644
--- a/drm/libmediadrm/tests/Android.bp
+++ b/drm/libmediadrm/tests/Android.bp
@@ -18,15 +18,21 @@
       "android.hardware.drm@1.0",
       "libbinder",
       "liblog",
-      "libmediadrm",
+      "libmediadrmmetrics_full",
       "libmediametrics",
+      "libprotobuf-cpp-full",
       "libutils",
     ],
-    include_dirs: ["frameworks/av/include/media"],
-    cflags: [
-      "-Werror",
-      "-Wall",
+    static_libs: ["libgmock"],
+    include_dirs: [
+      "frameworks/av/include/media",
     ],
+    cflags: [
+        // Suppress unused parameter and no error options. These cause problems
+        // when using the map type in a proto definition.
+        "-Wno-unused-parameter",
+        "-Wno-error",
+    ]
 }
 
 cc_test {