Change shared library name (again) to make sure our copy takes precedence on CyanogenMod

Commit 28d47b8... ("Fix java.lang.UnsatisfiedLinkError error.") changed
the name of the shared library from libandroidterm to libandroidterm2,
to avoid a potential library conflict with API/ABI incompatible versions
being shipped in some custom firmwares.  Unfortunately, CyanogenMod also
uses the name libandroidterm2:

https://github.com/CyanogenMod/android_packages_apps_AndroidTerm/commit/7d0de89f0ed5231a7d7eb3ca7917accb83c8eaee

Change the name again, this time to something that should hopefully be
unique, which should fix the problems that CyanogenMod users have been
reporting in the Android Market comments.  (A big scary warning to
firmware distributors that the shared library ABI must not be modified
without consulting upstream might be appropriate somewhere ...)

Signed-off-by: Jack Palevich <jackpal@google.com>

diff --git a/Android.mk b/Android.mk
index 378b792..f3227ae 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -30,11 +30,11 @@ LOCAL_PACKAGE_NAME := AndroidTerm
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_JNI_SHARED_LIBRARIES := libandroidterm
+LOCAL_JNI_SHARED_LIBRARIES := libjackpal-androidterm2
 
 include $(BUILD_PACKAGE)
 
 # ============================================================
 
 # Also build all of the sub-targets under this one: the shared library.
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/jni/Android.mk b/jni/Android.mk
index 7ed7785..7e2b625 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -21,7 +21,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 # This is the target being built.
-LOCAL_MODULE:= libandroidterm2
+LOCAL_MODULE:= libjackpal-androidterm2
 
 # All of the source files that we will compile.
 LOCAL_SRC_FILES:= \

diff --git a/src/jackpal/androidterm/Exec.java b/src/jackpal/androidterm/Exec.java
index 2dfcb46..3f94761 100644 (file)
--- a/src/jackpal/androidterm/Exec.java
+++ b/src/jackpal/androidterm/Exec.java
@@ -30,7 +30,7 @@ import java.io.FileDescriptor;
 public class Exec
 {
     static {
-        System.loadLibrary("androidterm2");
+        System.loadLibrary("jackpal-androidterm2");
     }
 
     /**