satok
481a75fcfa
Merge remote branch 'goog/master'
...
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
2010-07-17 19:20:35 +09:00
Tadashi G. Takaoka
cbd4592fe1
Add JNI_H_INCLUDE directory to LOCAL_C_INCLUDES to be able to build under source tree
...
Change-Id: I06d1687fbd7f9d02c069d84a50c2b53950372733
2010-07-16 16:45:12 -07:00
Ying Wang
30ce6f0530
Fix sim build
...
NDK does not support sim build.
Change-Id: If3164399d72786c9445cd308376497b8ba76011c
2010-07-16 11:36:20 -07:00
satok
b9c57e6540
Merge remote branch 'goog/master'
...
Conflicts:
java/res/xml/prefs.xml
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/Dictionary.java
java/src/com/android/inputmethod/latin/ExpandableDictionary.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Suggest.java
tests/src/com/android/inputmethod/latin/tests/SuggestTests.java
2010-07-16 13:02:45 +09:00
Ying Wang
2a118d844e
Unbundle LatinIME
...
Change-Id: I9f55377d5de050d18ee4a3b29bc43b19b0fababd
2010-07-14 17:32:12 -07:00
Dan Bornstein
f53d0da540
resolved conflicts for merge of 1633fa9b
to master
...
Change-Id: Ifa5d216091696b90ecc215ca4fd6110e79bbdf99
2010-05-05 18:51:29 -07:00
Dan Bornstein
bf45d3619f
For issue #2651381 , allow library prelinking.
...
Change-Id: If7015f2fa5932f69807797ffcc496550d5cb1630
2010-05-05 09:38:52 -07:00
Ken Wakasa
826269c8ae
Get rid of dependency on native AssetManager API. Confirmed the native code builds with the NDK r3.
...
Change-Id: I0d2d3a0e262847d6948a0336a35440e21e312ad2
2010-04-27 22:23:03 +09:00
Ken Wakasa
4606367f98
Get rid of dependency on native AssetManager API. Confirmed the native code builds with the NDK r3.
...
Change-Id: I6a9a5bb4129e9269d74348801436c9e5e0058da5
2010-04-27 08:56:56 +09:00
Ken Wakasa
707505ec18
A part of efforts of unbundling LatinIME: Get rid of ICU dependency in the native code.
...
This is actually a back merge from the LatinIME sandbox. Please refer to
http://arvarest.i.corp.google.com:8080/#change,77
Change-Id: I3ff3781903d5c642c662c2d744f808be7e4d8997
2010-04-21 22:43:17 +09:00
Ken Wakasa
07cab72ce4
Fix the sandbox build & get rid of ICU dependency.
...
Changed package name from com.android.inputmethod.latin2 to com.google.android.inputmethod.latin2.
Copied LatinIME's current dictionaries from master's vendor directory.
Confirmed latin_tolower() function returns the result identical to ICU's u_tolower().
- Note that I will merge the ICU dependency removal change to master.
Change-Id: Ia85bd3e88ce5159934684e2228d8b0c5a8885296
2010-04-20 17:55:53 +09:00
Ken Wakasa
1cf0ce74e8
Make this sandbox buildable under the froyo tree using symlink under vendor/google/apps.
...
Change-Id: Ia83a8e27d7a44a3a4dcf21b7a0bf0ab814f106ea
2010-04-07 18:58:46 +09:00
Amith Yamasani
07b1603a3f
Don't let the native code target be included twice when unbundling.
...
Move java code to a different directory so that the unbundled
version doesn't try to compile the native code again.
Change-Id: I05cf9e643824ddc448821f69805ccb0240c5b986
2010-03-09 15:01:09 -08:00