[Remoting Android] Fix component build runtime error

remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java

Index: remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
diff --git a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
index 27c734cd873c10508b9e1d8645cb86b222b2dd58..85b9d1c8ba8c73d71bf9359107819ad132090d2c 100644
--- a/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
+++ b/remoting/android/java/src/org/chromium/chromoting/jni/JniInterface.java
@@ -23,6 +23,8 @@ public class JniInterface {
 
     private static final String TOKEN_SCOPE = "oauth2:https://www.googleapis.com/auth/chromoting";
 
+    private static final String JNI_LIB_NAME = "remoting_client_jni";

[Lambros, 2016/08/09 00:51:54]

Maybe just LIBRARY_NAME ?

[Yuwei, 2016/08/09 00:56:17]

Done.

+
     // Used to fetch auth token for native client.
     private static OAuthTokenConsumer sLoggerTokenConsumer;
 
@@ -36,7 +38,12 @@ public class JniInterface {
     public static void loadLibrary(Context context) {
         ContextUtils.initApplicationContext(context.getApplicationContext());
         sLoggerTokenConsumer = new OAuthTokenConsumer(context.getApplicationContext(), TOKEN_SCOPE);
-        System.loadLibrary("remoting_client_jni");
+        try {
+            System.loadLibrary(JNI_LIB_NAME);
+        } catch (UnsatisfiedLinkError e) {
+            Log.w(TAG, "Couldn't load " + JNI_LIB_NAME + ", trying " + JNI_LIB_NAME + ".cr");
+            System.loadLibrary(JNI_LIB_NAME + ".cr");
+        }
         ContextUtils.initApplicationContextForNative();
         nativeLoadNative();
     }