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

Undo bad merge

Browse Source 
This CL undoes the merge cc28abea0b by
TreeHugger that should not have gone to master.  We re-enable a unit
tests that is required for OC MR1, but is not required for OC.

It also includes a minor change that allows the oemcrypto mock to be
built by an Android NDK:
Merge from Widevine repo of http://go/wvgerrit/24681

b/31458046
b/35141278

Change-Id: I8edc51504a16f1825ef765aeaff6f77f034f0362
This commit is contained in:
Fred Gylys-Colwell
2017-04-14 13:31:12 -07:00
parent 0591d7315e
commit cab913f848
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 <vector>
#include <openssl/rsa.h>
#include "openssl/rsa.h"
#include "OEMCryptoCENC.h" // Needed for enums only.
#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.
class OEMCryptoAndroidOCTest : public OEMCryptoAndroidNYCTest {};
// Note: this test is disabled for oc-dev branch. It is still required on
// oc-mr1-dev and master branches.
TEST_F(OEMCryptoAndroidOCTest, DISABLED_MinVersionNumber13) {
TEST_F(OEMCryptoAndroidOCTest, MinVersionNumber13) {
uint32_t version = OEMCrypto_APIVersion();
ASSERT_GE(version, 13u);
}