Merge latest oemcrypto-v17 change

No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions

View File

@@ -201,7 +201,7 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
struct CdmInfo {
CdmInfo();
FileSystem file_system;
wvutil::FileSystem file_system;
std::unique_ptr<CdmEngine> cdm_engine;
};