From 5764d3f801502003435b55028484359c08ebf30d Mon Sep 17 00:00:00 2001 From: Haibo Huang Date: Mon, 20 May 2019 11:17:16 -0700 Subject: [PATCH] Using ::testing::DoAll Without this statement, compilation failed with new googletest. Test: build Bug: 129498355 Change-Id: I5e3f5310617e00821f70079fc700bc3f87c3d0ab --- libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp | 1 + libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp b/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp index 577de852..7097a48b 100644 --- a/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp +++ b/libwvdrmengine/mediacrypto/test/WVCryptoPlugin_test.cpp @@ -37,6 +37,7 @@ using ::android::MemoryDealer; using ::testing::_; using ::testing::DefaultValue; +using ::testing::DoAll; using ::testing::ElementsAreArray; using ::testing::Field; using ::testing::InSequence; diff --git a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp index f900d592..ac858f81 100644 --- a/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp +++ b/libwvdrmengine/mediadrm/test/WVDrmPlugin_test.cpp @@ -39,6 +39,7 @@ using ::testing::AllOf; using ::testing::Args; using ::testing::AtLeast; using ::testing::DefaultValue; +using ::testing::DoAll; using ::testing::ElementsAreArray; using ::testing::Field; using ::testing::InSequence;