Revert "Cherry pick 18.4 changes to udc-widevine-dev"
This reverts commit 7186433edf.
Reason for revert: Build breakage - b/323194350
Change-Id: Ibba4f5289b8f0d5e835dfba9ceb1e601784af634
This commit is contained in:
committed by
Android (Google) Code Review
parent
7186433edf
commit
540c8dfd50
@@ -39,10 +39,6 @@ class OEMCryptoSessionTests : public OEMCryptoClientTest {
|
||||
|
||||
void SetUp() override {
|
||||
OEMCryptoClientTest::SetUp();
|
||||
if (wvoec::global_features.derive_key_method ==
|
||||
wvoec::DeviceFeatures::NO_METHOD) {
|
||||
GTEST_SKIP() << "Test for devices that can derive session keys only.";
|
||||
}
|
||||
EnsureTestROT();
|
||||
if (global_features.usage_table) {
|
||||
CreateUsageTableHeader();
|
||||
@@ -96,6 +92,8 @@ class OEMCryptoSessionTests : public OEMCryptoClientTest {
|
||||
}
|
||||
};
|
||||
|
||||
class OEMCryptoSessionTestKeyboxTest : public OEMCryptoSessionTests {};
|
||||
|
||||
// This class is for testing a single license with the default API version
|
||||
// of 16.
|
||||
class OEMCryptoLicenseTestAPI16 : public OEMCryptoSessionTests {
|
||||
@@ -409,4 +407,4 @@ class OEMCryptoRefreshTestAPI16 : public OEMCryptoRefreshTest {};
|
||||
|
||||
} // namespace wvoec
|
||||
|
||||
#endif // CDM_OEMCRYPTO_LICENSE_TEST_
|
||||
#endif // CDM_OEMCRYPTO_LICENSE_TEST_
|
||||
Reference in New Issue
Block a user