From 54360424a17bc03ed168d8dd2e1fc36b9cbeae9b Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Mon, 16 Jun 2014 14:46:22 +0900
Subject: [PATCH] Dicttool's shared lib is now built for 64bit
Change-Id: I3a21384e8ee6b419088f8140ff56a4ee89c3b052
---
tools/dicttool/etc/dicttool_aosp | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/tools/dicttool/etc/dicttool_aosp b/tools/dicttool/etc/dicttool_aosp
index 09d65c691f..fc918f0f83 100755
--- a/tools/dicttool/etc/dicttool_aosp
+++ b/tools/dicttool/etc/dicttool_aosp
@@ -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" "$@"
--
GitLab