widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Undo bad merge"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-19 19:53:56 +00:00
committed by Android (Google) Code Review
parent 3c971c8964 cab913f848
commit 091d35e771
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/mock/src/oemcrypto_auth_mock.h
View File

@@ -8,7 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include <openssl/rsa.h> #include "openssl/rsa.h"
#include "OEMCryptoCENC.h" // Needed for enums only. #include "OEMCryptoCENC.h" // Needed for enums only.
#include "oemcrypto_key_mock.h" #include "oemcrypto_key_mock.h"

4
libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp
View File

@@ -133,9 +133,7 @@ TEST_F(OEMCryptoAndroidNYCTest, MinVersionNumber11) {
// These tests are required for O MR1 Android devices. // These tests are required for O MR1 Android devices.
class OEMCryptoAndroidOCTest : public OEMCryptoAndroidNYCTest {}; class OEMCryptoAndroidOCTest : public OEMCryptoAndroidNYCTest {};
// Note: this test is disabled for oc-dev branch. It is still required on TEST_F(OEMCryptoAndroidOCTest, MinVersionNumber13) {
// oc-mr1-dev and master branches.
TEST_F(OEMCryptoAndroidOCTest, DISABLED_MinVersionNumber13) {
uint32_t version = OEMCrypto_APIVersion(); uint32_t version = OEMCrypto_APIVersion();
ASSERT_GE(version, 13u); ASSERT_GE(version, 13u);
} }