[Remoting Android] Fix component build runtime error

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting.jni;
 
 import android.content.Context;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chromoting.OAuthTokenConsumer;
 import org.chromium.chromoting.base.OAuthTokenFetcher;
 
 /**
  * Initializes the Chromium remoting library, and provides JNI calls into it.
  * All interaction with the native code is centralized in this class.
  */
 @JNINamespace("remoting")
 public class JniInterface {
     private static final String TAG = "Chromoting";
 
     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;
 
     private static String sAccount;
 
     /**
      * To be called once from the Application context singleton. Loads and initializes the native
      * code. Called on the UI thread.
      * @param context The Application context.
      */
     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();
     }
 
     public static void setAccountForLogging(String account) {
         sAccount = account;
     }
 
     @CalledByNative
     private static void fetchAuthToken() {
@@ skipping 12 matching lines @@
             }
         });
     }
 
     /** Performs the native portion of the initialization. */
     private static native void nativeLoadNative();
 
     /** Notifies the native client with the new auth token */
     private static native void nativeOnAuthTokenFetched(String token);
 }