Ying Wang
c49c9c52be
resolved conflicts for merge of 90b948ea
to master
...
Change-Id: Ic86260b4e49ebda2ee718eadf0109ad9626a68e6
2014-06-11 12:28:56 -07:00
Ying Wang
fb57fe263c
Use LOCAL_MULTILIB to build host lib as 64-bit
...
Also we should use LOCAL_REQUIRED_MODULES instead of
LOCAL_ADDITIONAL_DEPENDENCIES.
Bug: 13751317
Change-Id: I742ff14b3de168e14e646749cf4f6bc9c9e7bc62
2014-06-09 12:16:30 -07:00
Jean Chalard
99ac090738
Fix the build.
...
Change-Id: Ie1cdc5642d8b6f63dbf71603b993f36b5c5f923c
2014-05-29 21:51:49 +09:00
Tadashi G. Takaoka
99258cb0b2
Warn that dicttool_aosp isn't supported on Darwin
...
Change-Id: I56def43213e94e5b1267e8e900c2192f4b0c2cb5
2014-05-24 03:08:57 +09:00
Tadashi G. Takaoka
a91561aa58
Use Java 7 diamond operator
...
Change-Id: If16ef50ae73147594615d0f49d6a22621eaf1aef
2014-05-24 01:05:42 +09:00
Jean Chalard
7086d88d3e
Have dicttool test tidy up after itself.
...
Bug: 13776363
Change-Id: Icb1d3fc0efe71e0339b434928e8aed507f2fb590
2014-05-23 19:56:57 +09:00
Keisuke Kuroyanagi
83c40a2301
Use PrevWordsInfo instead of String in Java side.
...
Bug: 14119293
Bug: 14425059
Change-Id: I3d5da84881a49a04550180dd9aac2c37da2ed762
2014-05-19 13:55:40 +09:00
Jean Chalard
5ce39dfa78
Fix a bug where changing languages kills the composition.
...
Bug: 14926896
Change-Id: Id2a06c68a51f833db4d8bbc858a232c2696afb6e
2014-05-14 20:34:32 +09:00
Jean Chalard
be99616afa
Create the path for specifying combining rules in the subtype
...
Also add the skeleton of the combining rules for Myanmar
reordering as a pilot.
Bug: 13945569
Change-Id: Iabeb6838f45f1efff482143595ce5b48543e0c43
2014-05-12 15:58:51 +09:00
Ken Wakasa
694114feca
Remove redundant LOCAL_IS_HOST_MODULE assignments
...
Also, remove irrelevant LOCAL_NDK_STL_VARIANT for host modules.
Change-Id: I45e916c11f7c1f9b13956f01274a82ee7de1f558
2014-04-04 22:32:45 +09:00
Ken Wakasa
3ccbf7ef08
32-bit dicttool
...
As we can't easily turn on -m64 for only one module, the JNI library for
a host tool should be 32-bit, at least for now.
Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
2014-04-04 20:10:04 +09:00
Yohei Yukawa
c73b46f40a
Do not call exit 1 when loaded with source command
...
BUG: 13754552
Change-Id: I3d5e4c0786547521325405100c175dd1b21754df
2014-04-02 19:47:08 +09:00
Ken Wakasa
96092ebd78
Use Clang for dicttool
...
Fix the wrong shared lib name too.
Change-Id: Ib98c55dfd1aee4a762dc96b12df3a463bef2ac80
2014-03-27 19:14:37 +09:00
Keisuke Kuroyanagi
93cda5bb39
Move code only used for dicttool and tests under tests.
...
Bug: 13035567
Change-Id: I13c6df013ef2b67c9bf67455d9c32d283bf9ea2e
2014-03-27 15:30:32 +09:00
Jean Chalard
cbed462d19
[CB12] Reset the combining state when resetting the composer
...
Bug: 13406701
Change-Id: I490574b7ca4b953f67dd2c0ef97401297fade0a4
2014-03-24 17:44:31 +09:00
Jean Chalard
835965a75e
[CB11] Get the result of the combination
...
Change-Id: I165ec4a24f5b1334d55c14948e4d942ec40eb33b
2014-03-20 23:33:12 +09:00
Jean Chalard
f2bb15b0ab
[CB09] Pass events through the combiner chain
...
Bug: 13406701
Change-Id: I4696f145478afdd132314b7d3c148c3a9ca11c9c
2014-03-20 16:59:29 +09:00
Jean Chalard
7ede642df4
[CB08] Create a combiner chain in the word composer.
...
Bug: 13406701
Change-Id: I3b9f75de9283f76366d1bef7e14a8f22f2186669
2014-03-20 14:27:55 +09:00
Jean Chalard
f8accd8839
[CB04] Add an event array to WordComposer.
...
Bug: 13406701
Change-Id: I9ecd2709c8f1c678a85b0cfaf7c5ed4f78459821
2014-03-14 12:44:49 +09:00
Keisuke Kuroyanagi
f14cf3e64c
Fix: dicttool build.
...
Change-Id: I5c3bcbe9f3054bdd1a760398fe11344e0e05ac6a
2014-03-07 13:01:48 +00:00
Keisuke Kuroyanagi
32326a9d7a
Merge "Move DictionaryOptions from FusionDictionary to FormatSpec."
2014-03-07 10:42:18 +00:00
Keisuke Kuroyanagi
a103e29d00
Merge "Separate WeightedString from FusionDictionary."
2014-03-07 09:07:26 +00:00
Ken Wakasa
344742b0d1
Recover the dicttool build except for Mac
...
With a hack: Temporarily disable host tool build on Mac until the
build system is ready for C++11.
Change-Id: Ib412ba0d7fecc968cc09b4d8fde4e838bdc0618a
2014-03-07 15:04:27 +09:00
Ken Wakasa
ca0a0da864
Switch to C++11
...
Change-Id: Ib2970327c36422d7b11103d52ba7e9e52db5554f
2014-03-06 20:32:20 +09:00
Keisuke Kuroyanagi
3ad4af2354
Move DictionaryOptions from FusionDictionary to FormatSpec.
...
Bug: 8187060
Bug:13035567
Change-Id: Id4f45e589521ae98c926a4c0607be10ce1a983f2
2014-03-06 18:53:09 +09:00
Keisuke Kuroyanagi
516f86815d
Separate WeightedString from FusionDictionary.
...
Bug: 8187060
Change-Id: I40c1dafca3eb52244c64fdb4c1db30a56385d678
2014-03-06 18:53:06 +09:00
Keisuke Kuroyanagi
e784148ae6
Separate utility methods from BinaryDictionary.
...
Bug: 8187060
Change-Id: Ice2984e332b7bd3bb17174aefc80b5635b72fc50
2014-03-05 18:19:34 +09:00
Keisuke Kuroyanagi
36305d4207
Fix: dicttool build.
...
Change-Id: I592b14eba895786d0981586a01ef545e003396c8
2014-02-28 19:04:49 +09:00
Jean Chalard
890b44e537
Correctly read the header of APK-embedded dicts
...
Bug: 13164518
Change-Id: I8768ad887af8b89ad9f29637f606c3c68629c7ca
2014-02-24 22:54:01 +09:00
Keisuke Kuroyanagi
0fc93fe445
Implement PatriciaTriePolicy::getNextWordAndNextToken().
...
Bug: 12810574
Change-Id: Id1d44f90de9455d9cbe7b6e0a161cae91d6d422c
2014-02-15 17:39:20 +09:00
Keisuke Kuroyanagi
8e3a1d0f89
Remove unused argument from readDictionaryBinary.
...
Bug: 12810574
Change-Id: Ice415ebd8d11162facca3fe8927ef8a616b11424
2014-02-14 19:02:15 +09:00
Keisuke Kuroyanagi
69ccac6e51
Remove unused code.
...
Bug: 12810574
Change-Id: If0ef02a984469a3b6e0c00b1c3c8d98d0d2b5466
2014-02-10 15:05:11 +09:00
Keisuke Kuroyanagi
8ffc631826
Make PtNode have ProbabilityInfo instead of raw value.
...
Bug: 11281877
Bug: 12810574
Change-Id: Id1cda0afc74c4e30633c735729143491b2274a7b
2014-02-10 15:05:08 +09:00
Keisuke Kuroyanagi
b24de426fc
Use CombinedFormatUtils to convert dict elements to strings.
...
Bug: 11281877
Bug: 12810574
Change-Id: Ib631f75eab73abc9877a7698171c45e8f2fc7600
2014-02-06 16:09:25 +09:00
Keisuke Kuroyanagi
5f5feeba13
Consolidate WordProperty and Word.
...
Bug: 11281877
Bug: 12810574
Change-Id: I9dc99188f80f25a8780c1860dab46e4aa80a23e5
2014-02-06 15:13:33 +09:00
Keisuke Kuroyanagi
df1d3e733e
Make WeightedString have ProbabilityInfo.
...
Bug: 11281877
Bug: 12810574
Change-Id: I265e3d8654c75766cd0e0d09d67ef62b4566298a
2014-02-05 21:44:55 +09:00
Keisuke Kuroyanagi
aaf864db7b
Merge "Separate header class from FormatSpec."
2014-02-04 12:42:44 +00:00
Keisuke Kuroyanagi
b986f78ba8
Separate header class from FormatSpec.
...
Bug: 12810574
Change-Id: Iacf1cd05a268bf690ab864b5e32a18a4b0ccc693
2014-02-04 21:36:04 +09:00
Keisuke Kuroyanagi
33fd13bf3c
Check timestamp for each pointer.
...
Bug: 11325631
Change-Id: I4e296cdeccf21323c5732754e86c3a4075ccf82a
2014-02-04 14:04:26 +09:00
Jean Chalard
4e6f72cb80
Merge "[HD03] Straighten out attribute key names in Java."
2014-01-31 08:40:25 +00:00
Keisuke Kuroyanagi
faa9cd1fbd
Fix dicttool_aosp build.
...
Change-Id: I52918fea02425b628045443d63d178e289ac4fb7
2014-01-31 17:16:47 +09:00
Jean Chalard
79b2e4d86c
[HD03] Straighten out attribute key names in Java.
...
Bug: 11281748
Change-Id: I1d813bdacd45bcfd9c4cc73ac1d67c5c89854e86
2014-01-31 14:46:07 +09:00
Jean Chalard
d1f463eacf
[IL69] Oust Keyboard from WordComposer#setComposingWord
...
Bug: 8636060
Change-Id: I624a45500603dfad355ee3b8b794b2d895219c0b
2014-01-23 15:32:59 +09:00
Tadashi G. Takaoka
47f04e2e35
Fix checkbuild breakage on dicttool
...
This CL fix the checkbuild build, though I'm not sure it can create
working dicttool or not.
Change-Id: I5aec34a0f72441c75ac48184c0550b8e0fc40634
2014-01-17 00:25:11 +09:00
Jean Chalard
84a3047e80
Fix build.
...
Change-Id: I6d0b572190080e58e95f72856ad39e72a49537b7
2014-01-10 12:18:26 +09:00
Keisuke Kuroyanagi
c2fd53ee0e
Remove ver4 dict updater.
...
Change-Id: I468994c98d091be621b9fb3fbe6405c67fc6a465
2013-12-17 18:17:51 +09:00
Jean Chalard
5590e9d040
Merge "Make the bad header a checked exception and fix dicttool test"
2013-12-16 07:18:44 +00:00
Jean Chalard
3df617323e
Make the bad header a checked exception and fix dicttool test
...
Change-Id: If780a2a1cb722aee83d910904c0a6315add9552d
2013-12-16 15:40:45 +09:00
Jean Chalard
b868375763
Fix failing tests
...
- Version 3 is not supported
- Now passing the right string to open v4 dicts. Fix the tests for this.
Change-Id: I7829330c3568a715b96396ba4e4e69c6e17775ab
2013-12-16 14:32:19 +09:00
Jean Chalard
a245d15da5
Have dicttool use the native library to generate v4 dicts.
...
Yay !
Change-Id: Iea8ced9e81031b9ab7eff05ad9ef7215be248de9
2013-12-13 18:18:20 +09:00