Merge changes from topic "level_3_oecv15"

* changes:
  Changes to adapter + gyp to support v15
  Add full decrypt path testing functionality to Level 3
  Update pointers to substrings in Level 3
  Update level 3 reference API for v15
This commit is contained in:
Srujan Gaddam
2018-12-11 19:54:39 +00:00
committed by Android (Google) Code Review
14 changed files with 476393 additions and 760665 deletions

View File

@@ -2018,7 +2018,7 @@ class OEMCryptoSessionTestsDecryptTests
EXPECT_EQ(unencryptedData, output_buffer);
if (global_features.supports_crc) {
uint32_t hash =
wvcrc32(&unencryptedData[0], unencryptedData.size());
wvoec::wvcrc32(&unencryptedData[0], unencryptedData.size());
ASSERT_EQ(OEMCrypto_SUCCESS,
OEMCrypto_SetDecryptHash(
s.session_id(), 1, reinterpret_cast<const uint8_t*>(&hash),