Merge "Add widevine vendor apex"

libwvdrmengine/cdm/Android.bp

@@ -77,5 +77,4 @@ cc_library_static {
     ],
 
     proprietary: true,
-
 }

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -42,6 +42,7 @@ using namespace wvoec3;
 using video_widevine::ProvisioningResponse;
 using wvcdm::kLevel3;
 using wvcdm::kLevelDefault;
+using namespace std;
 
 namespace {
 
@@ -931,7 +932,19 @@ class Adapter {
       return result;
     }
     if (level1_library_ == nullptr) {
-      level1_library_ = dlopen(library_name.c_str(), RTLD_NOW);
+      vector<string> library_paths = {"/vendor/", "/system/", "/odm/"};
+      string sub_dir;
+      #if __LP64__
+            sub_dir = "lib64/";
+      #else
+            sub_dir = "lib/";
+      #endif
+
+      for (auto& path : library_paths) {
+        level1_library_ = dlopen((path + sub_dir + library_name).c_str(), RTLD_NOW);
+        if (level1_library_) break;
+      }
+
       if (level1_library_ == nullptr) {
         LOGW("Could not load %s. Falling back to L3.  %s", library_name.c_str(),
              dlerror());