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

Merge latest oemcrypto-v17 change

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/level3/include/clear_cache_function.h
View File

@@ -42,7 +42,7 @@ bool supports_membarier_syscall() {
// Reference:
// * membarrier(2)
// * art::jit::JitMemoryRegion::CommitCode
long membarrier_function(int command) {
int membarrier_function(int command) {
static bool supports_membarier = supports_membarier_syscall();
if (supports_membarier) {
return syscall(__NR_membarrier, command, 0);
@@ -55,7 +55,7 @@ long membarrier_function(int command) {
# pragma message \
"(info): __NR_membarrier unavailable; membarrier_function will be no-op."
long membarrier_function(int) {
int membarrier_function(int) {
errno = ENOSYS;
return -1;
}

2
libwvdrmengine/level3/include/level3_file_system_android.h
View File

@@ -31,7 +31,7 @@ class OEMCrypto_Level3AndroidFileSystem : public OEMCrypto_Level3FileSystem {
private:
std::string base_path_;
std::unique_ptr<wvcdm::FileSystem> file_system_;
std::unique_ptr<wvutil::FileSystem> file_system_;
};
} // namespace wvoec3