Merge latest oemcrypto-v17 change

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

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64

libwvdrmengine/level3/include/clear_cache_function.h

@@ -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;
 }

libwvdrmengine/level3/include/level3_file_system_android.h

@@ -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

libwvdrmengine/level3/src/level3_file_system_android.cpp

@@ -10,8 +10,8 @@
 #include "properties.h"
 #include "wv_cdm_types.h"
 
-using wvcdm::File;
-using wvcdm::FileSystem;
+using wvutil::File;
+using wvutil::FileSystem;
 
 namespace wvoec3 {
 
@@ -32,8 +32,8 @@ OEMCrypto_Level3AndroidFileSystem::OEMCrypto_Level3AndroidFileSystem()
   while (pos < size) {
     base_path_[pos] = '\0';
     if (mkdir(base_path_.c_str(), 0775) != 0 && errno != EEXIST) {
-      wvcdm::Log(
-          "", "", 0, wvcdm::LOG_ERROR,
+      wvutil::Log(
+          "", "", 0, wvutil::LOG_ERROR,
           "Could not create base directories for Level3FileSystem, error: %s\n",
           strerror(errno));
     }