diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-06-16 06:54:56 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 06:54:56 +0000 |
| commit | e695b39fbbb1837f86f331d7a0870e4c14b0b818 (patch) | |
| tree | 8735af53aab22b5f2759af7c07e35189ff27be9e | |
| parent | 975d506a3880f51d0a59328d697c230a8063e7b9 (diff) | |
| parent | 54360424a17bc03ed168d8dd2e1fc36b9cbeae9b (diff) | |
| download | latinime-e695b39fbbb1837f86f331d7a0870e4c14b0b818.tar.gz latinime-e695b39fbbb1837f86f331d7a0870e4c14b0b818.tar.xz latinime-e695b39fbbb1837f86f331d7a0870e4c14b0b818.zip | |
am 54360424: Dicttool\'s shared lib is now built for 64bit
* commit '54360424a17bc03ed168d8dd2e1fc36b9cbeae9b':
Dicttool's shared lib is now built for 64bit
| -rwxr-xr-x | tools/dicttool/etc/dicttool_aosp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tools/dicttool/etc/dicttool_aosp b/tools/dicttool/etc/dicttool_aosp index 09d65c691..fc918f0f8 100755 --- a/tools/dicttool/etc/dicttool_aosp +++ b/tools/dicttool/etc/dicttool_aosp @@ -38,13 +38,8 @@ 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" "$@" |