Revert "Merge latest oemcrypto-v17 change"

This reverts commit 642965c678.

Reason for revert: Droidfood Blocking Bug: 217145027

Change-Id: I669b72fcd91c62e28883b5f55eb36af274d85806
(cherry picked from commit 8dbea15e5da05b371572297041454569dc166c90)
Merged-In:I669b72fcd91c62e28883b5f55eb36af274d85806
This commit is contained in:
Daniel Chapin
2022-01-31 19:21:18 +00:00
committed by Android Build Coastguard Worker
parent 1397b61f87
commit d69b488be1
176 changed files with 296842 additions and 301106 deletions

View File

@@ -38,7 +38,7 @@ TEST(CounterMetricTest, NoFieldsSuccess) {
EXPECT_EQ(11, metric_proto.test_counters(0).count());
EXPECT_FALSE(metric_proto.test_counters(0).has_attributes())
<< std::string("Unexpected attributes value. Serialized metrics: ")
<< wvutil::b2a_hex(serialized_metrics);
<< wvcdm::b2a_hex(serialized_metrics);
}
TEST(CounterMetricTest, OneFieldSuccess) {

View File

@@ -45,7 +45,7 @@ TEST_F(EventMetricTest, NoFieldsSuccess) {
EXPECT_EQ(2u, metric_proto.test_distributions(0).operation_count());
EXPECT_FALSE(metric_proto.test_distributions(0).has_attributes())
<< std::string("Unexpected attributes value. Serialized metrics: ")
<< wvutil::b2a_hex(serialized_metrics);
<< wvcdm::b2a_hex(serialized_metrics);
}
TEST_F(EventMetricTest, OneFieldSuccess) {