Merge "Preload sfplugin_ccodec for performance" into qt-dev
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 7ec8309..d28c72f 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -188,6 +188,13 @@
System.loadLibrary("android");
System.loadLibrary("compiler_rt");
System.loadLibrary("jnigraphics");
+
+ // tolerate missing sfplugin_ccodec which is only present on Codec 2 devices
+ try {
+ System.loadLibrary("sfplugin_ccodec");
+ } catch (Error | RuntimeException e) {
+ Log.w(TAG, "Problem preloading sfplugin_ccodec: " + e);
+ }
}
native private static void nativePreloadAppProcessHALs();