Rebuild Haystack and Store L3 Keybox in /data/vendor
(This is a merge of http://go/wvgerrit/25900 and http://go/wvgerrit/25920) This commit contains the latest Haystack prebuilt binaries based on the latest OEMCrypto code in the Widevine tree. This is to pick up the change "Report error OEMCrypto_ERROR_ENTRY_IN_USE", which fixes several failing unit tests. This CL also adjusts the L3 library so that it stores its data in the directory specified by the layer above. level3/x86_64/libwvlevel3.a Level3 Library 7284 Apr 13 2017 16:58:07 level3/arm/libwvlevel3.a Level3 Library 4445 Apr 13 2017 16:48:19 level3/mips64/libwvlevel3.a Level3 Library 7285 Apr 13 2017 23:52:51 level3/mips/libwvlevel3.a Level3 Library 4465 Apr 13 2017 23:16:02 level3/arm64/libwvlevel3.a Level3 Library 7283 Apr 13 2017 17:05:12 level3/x86/libwvlevel3.a Level3 Library 4464 Apr 13 2017 16:36:25 Bug: 36656178 Bug: 37210088 Test: build_and_run_all_unit_tests.sh and GTS tests Change-Id: Ia5b272cd945f0c9f2fe37ecd0f3ccd2f2ff398bc
This commit is contained in:
committed by
Fred Gylys-Colwell
parent
6260d4d628
commit
76d3ca9091
@@ -432,9 +432,9 @@ class Adapter {
|
|||||||
std::string base_path;
|
std::string base_path;
|
||||||
wvcdm::Properties::GetDeviceFilesBasePath(wvcdm::kSecurityLevelL3,
|
wvcdm::Properties::GetDeviceFilesBasePath(wvcdm::kSecurityLevelL3,
|
||||||
&base_path);
|
&base_path);
|
||||||
bool is_in_app = Level3_IsInApp(base_path.c_str());
|
OEMCryptoResult result = Level3_Initialize(clear_cache_function,
|
||||||
OEMCryptoResult result = Level3_Initialize(clear_cache_function);
|
base_path.c_str());
|
||||||
if (is_in_app) {
|
if (Level3_IsInApp()) {
|
||||||
M_RECORD(
|
M_RECORD(
|
||||||
&metrics,
|
&metrics,
|
||||||
oemcrypto_initialization_mode_,
|
oemcrypto_initialization_mode_,
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -79,8 +79,9 @@ namespace wvoec3 {
|
|||||||
#define Level3_CreateOldUsageEntry _lcc70
|
#define Level3_CreateOldUsageEntry _lcc70
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
bool Level3_IsInApp(const char* path);
|
bool Level3_IsInApp();
|
||||||
OEMCryptoResult Level3_Initialize(void (*ClearCache)(void *, size_t));
|
OEMCryptoResult Level3_Initialize(void (*ClearCache)(void *, size_t),
|
||||||
|
const char* base_path);
|
||||||
OEMCryptoResult Level3_Terminate(void);
|
OEMCryptoResult Level3_Terminate(void);
|
||||||
OEMCryptoResult Level3_OpenSession(OEMCrypto_SESSION *session);
|
OEMCryptoResult Level3_OpenSession(OEMCrypto_SESSION *session);
|
||||||
OEMCryptoResult Level3_CloseSession(OEMCrypto_SESSION session);
|
OEMCryptoResult Level3_CloseSession(OEMCrypto_SESSION session);
|
||||||
|
|||||||
Reference in New Issue
Block a user