Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LatinIME
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
keyboard
LatinIME
Commits
73fe4952
Commit
73fe4952
authored
10 years ago
by
Ken Wakasa
Committed by
Android (Google) Code Review
10 years ago
Browse files
Options
Downloads
Plain Diff
Merge "32-bit dicttool"
parents
f3d9e036
3ccbf7ef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/dicttool/NativeLib.mk
+1
-8
1 addition, 8 deletions
tools/dicttool/NativeLib.mk
tools/dicttool/etc/dicttool_aosp
+10
-1
10 additions, 1 deletion
tools/dicttool/etc/dicttool_aosp
with
11 additions
and
9 deletions
tools/dicttool/NativeLib.mk
+
1
−
8
View file @
73fe4952
...
...
@@ -29,13 +29,7 @@ ifeq ($(FLAG_DBG), true)
LOCAL_CFLAGS
+=
-DFLAG_DBG
-funwind-tables
-fno-inline
endif
#FLAG_DBG
ifneq
($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
LOCAL_CFLAGS
+=
-m64
LOCAL_LDFLAGS
+=
-m64
endif
#HOST_JDK_IS_64BIT_VERSION
LOCAL_CFLAGS
+=
-DHOST_TOOL
-fPIC
-Wno-deprecated
LOCAL_NO_DEFAULT_COMPILER_FLAGS
:=
true
LOCAL_CFLAGS
+=
-DHOST_TOOL
-fPIC
-Wno-deprecated
-Wno-unused-parameter
-Wno-unused-function
LOCAL_CLANG
:=
true
# For C++11
...
...
@@ -44,7 +38,6 @@ LOCAL_CFLAGS += -std=c++11
LATINIME_NATIVE_JNI_DIR
:=
$(
LATINIME_DIR_RELATIVE_TO_DICTTOOL
)
/native/jni
LATINIME_NATIVE_SRC_DIR
:=
$(
LATINIME_DIR_RELATIVE_TO_DICTTOOL
)
/native/jni/src
LOCAL_C_INCLUDES
:=
$(
LOCAL_PATH
)
/
$(
LATINIME_NATIVE_SRC_DIR
)
# Used in jni_common.cpp to avoid registering useless methods.
include
$(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/NativeFileList.mk
...
...
This diff is collapsed.
Click to expand it.
tools/dicttool/etc/dicttool_aosp
+
10
−
1
View file @
73fe4952
...
...
@@ -68,5 +68,14 @@ 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
java
-ea
-classpath
"
$libpath
"
:
"
$jarpath
"
-Djava
.library.path
=
"
$libdir
"
"
$classname
"
"
$@
"
exec
${
DICTTOOL_JAVA
-java
}
-d32
-ea
-classpath
"
$libpath
"
:
"
$jarpath
"
\
-Djava
.library.path
=
"
$libdir
"
"
$classname
"
"
$@
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment