nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dicttool's shared lib is now built for 64bit 

Change-Id: I3a21384e8ee6b419088f8140ff56a4ee89c3b052
main
Ken Wakasa 2014-06-16 14:46:22 +09:00
parent a4f2e8eee0
commit 54360424a1
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/dicttool/etc/dicttool_aosp
View File

@ -37,14 +37,9 @@ classname=com.android.inputmethod.latin.dicttool.Dicttool
jarfile=dicttool_aosp.jar jarfile=dicttool_aosp.jar
frameworkdir="$progdir" frameworkdir="$progdir"
if [ ! -r "$frameworkdir/$jarfile" ] if [ ! -r "$frameworkdir/$jarfile" ]
then
frameworkdir=`dirname "$progdir"`/tools/lib
libdir=`dirname "$progdir"`/tools/lib
fi
if [ ! -r "$frameworkdir/$jarfile" ]
then then
frameworkdir=`dirname "$progdir"`/framework frameworkdir=`dirname "$progdir"`/framework
libdir=`dirname "$progdir"`/lib libdir=`dirname "$progdir"`/lib64
fi fi
if [ ! -r "$frameworkdir/$jarfile" ] if [ ! -r "$frameworkdir/$jarfile" ]
then then
@ -68,14 +63,5 @@ else
libpath="$frameworkdir/$lib" libpath="$frameworkdir/$lib"
fi 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 # might need more memory, e.g. -Xmx128M
exec ${DICTTOOL_JAVA-java} -d32 -ea -classpath "$libpath":"$jarpath" \ exec java -ea -classpath "$libpath":"$jarpath" -Djava.library.path="$libdir" "$classname" "$@"
-Djava.library.path="$libdir" "$classname" "$@"