Snap for 4557233 from f8d114ad11 to pi-release

Change-Id: I99c2233a8b310d9277b9b6e059bc9c69d279d873

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -714,8 +714,16 @@ class Adapter {
       return false;
     }
     ssize_t size = file_system.FileSize(filename);
+    if (size <= 0) {
+      LOGW("Could not find %s. Falling Back to L3.", filename.c_str());
+      level1_.Terminate();
+      metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
+          wvcdm::metrics::
+              OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_OPEN_FACTORY_KEYBOX);
+      return false;
+    }
     wvcdm::File* file = file_system.Open(filename, file_system.kReadOnly);
-    if (size <= 0 || !file) {
+    if (!file) {
       LOGW("Could not open %s. Falling Back to L3.", filename.c_str());
       level1_.Terminate();
       metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(

libwvdrmengine/level3/mips/Android.mk

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
     -DDYNAMIC_ADAPTER \
     -Wno-unused
 LOCAL_C_INCLUDES := \
+    system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/level3/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include
@@ -18,4 +19,4 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
 LOCAL_MODULE_TARGET_ARCH := mips
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

libwvdrmengine/level3/mips64/Android.mk

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
     -DDYNAMIC_ADAPTER \
     -Wno-unused
 LOCAL_C_INCLUDES := \
+    system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/level3/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include
@@ -18,4 +19,4 @@ LOCAL_PROPRIETARY_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_OWNER := widevine
 LOCAL_MODULE_TARGET_ARCH := mips64
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)

libwvdrmengine/level3/x86/Android.mk

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
     -DDYNAMIC_ADAPTER \
     -Wno-unused
 LOCAL_C_INCLUDES := \
+    system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/level3/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include

libwvdrmengine/level3/x86_64/Android.mk

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
     -DDYNAMIC_ADAPTER \
     -Wno-unused
 LOCAL_C_INCLUDES := \
+    system/core/include \
     vendor/widevine/libwvdrmengine/cdm/core/include \
     vendor/widevine/libwvdrmengine/level3/include \
     vendor/widevine/libwvdrmengine/oemcrypto/include