mirror of
https://gitlab.futo.org/keyboard/latinime.git
synced 2024-09-28 14:54:30 +01:00
Dicttool's shared lib is now built for 64bit
Change-Id: I3a21384e8ee6b419088f8140ff56a4ee89c3b052
This commit is contained in:
parent
a4f2e8eee0
commit
54360424a1
@ -37,14 +37,9 @@ classname=com.android.inputmethod.latin.dicttool.Dicttool
|
||||
jarfile=dicttool_aosp.jar
|
||||
frameworkdir="$progdir"
|
||||
if [ ! -r "$frameworkdir/$jarfile" ]
|
||||
then
|
||||
frameworkdir=`dirname "$progdir"`/tools/lib
|
||||
libdir=`dirname "$progdir"`/tools/lib
|
||||
fi
|
||||
if [ ! -r "$frameworkdir/$jarfile" ]
|
||||
then
|
||||
frameworkdir=`dirname "$progdir"`/framework
|
||||
libdir=`dirname "$progdir"`/lib
|
||||
libdir=`dirname "$progdir"`/lib64
|
||||
fi
|
||||
if [ ! -r "$frameworkdir/$jarfile" ]
|
||||
then
|
||||
@ -68,14 +63,5 @@ else
|
||||
libpath="$frameworkdir/$lib"
|
||||
fi
|
||||
|
||||
# Check if the host Java executable supports a 32-bit JVM. It needs to do because the JNI
|
||||
# library is 32-bit.
|
||||
${DICTTOOL_JAVA-java} -d32 -version > /dev/null 2>&1
|
||||
if [[ $? != 0 ]] ; then
|
||||
echo Please specify a Java executable that supports a 32-bit JVM as DICTTOOL_JAVA.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# might need more memory, e.g. -Xmx128M
|
||||
exec ${DICTTOOL_JAVA-java} -d32 -ea -classpath "$libpath":"$jarpath" \
|
||||
-Djava.library.path="$libdir" "$classname" "$@"
|
||||
exec java -ea -classpath "$libpath":"$jarpath" -Djava.library.path="$libdir" "$classname" "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user