Merge latest oemcrypto-v17 change

No-Typo-Check: Not related to this change. Bug: 161477208 Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
2022-01-21 05:58:12 +00:00
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
--- a/libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp
+++ b/libwvdrmengine/cdm/test/wv_cdm_metrics_test.cpp
@@ -182,7 +182,7 @@ TEST_F(WvContentDecryptionModuleMetricsTest,
    // Spot check a session-level metric.
    ASSERT_THAT(metrics.session_metrics().size(), Eq(i + 1))
        << "Unexpected failure with session_metrics: "
-        << wvcdm::b2a_hex(serialized_metrics);
+        << wvutil::b2a_hex(serialized_metrics);
  }
 }