Rebuild Haystack and Store L3 Keybox in /data/vendor am: 76d3ca9091

am: 84ae8875bf

Change-Id: Ifc4285b0743bb4e0c202f8d97c7844ad0c1fe7e2

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -432,9 +432,9 @@ class Adapter {
     std::string base_path;
     wvcdm::Properties::GetDeviceFilesBasePath(wvcdm::kSecurityLevelL3,
                                               &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(
           &metrics,
           oemcrypto_initialization_mode_,

libwvdrmengine/oemcrypto/include/level3.h

@@ -79,8 +79,9 @@ namespace wvoec3 {
 #define Level3_CreateOldUsageEntry         _lcc70
 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_OpenSession(OEMCrypto_SESSION *session);
 OEMCryptoResult Level3_CloseSession(OEMCrypto_SESSION session);