| 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..565e70cc9de05b70b661eb337949753b885a7f76 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 LIBRARY_NAME = "remoting_client_jni";
|
| +
|
| // 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(LIBRARY_NAME);
|
| + } catch (UnsatisfiedLinkError e) {
|
| + Log.w(TAG, "Couldn't load " + LIBRARY_NAME + ", trying " + LIBRARY_NAME + ".cr");
|
| + System.loadLibrary(LIBRARY_NAME + ".cr");
|
| + }
|
| ContextUtils.initApplicationContextForNative();
|
| nativeLoadNative();
|
| }
|
|
|