382 Commits

Author SHA1 Message Date
Fredrik Roubert
fcb08dbdee Let mk_hyb_file.py replace ßSS in .chr.txt files with ßẞ.
Here these mappings are used to convert from uppercase to lowercase,
and mk_hyb_file.py doesn't handle multi-character uppercase sequences.
Therefore, in case the sequence ßSS is encountered in a .chr.txt,
replace it internally with ßẞ.

Test: make -j
Change-Id: I8f678aad9298784f70645c453ec07da5bf43cb66
2017-04-27 15:18:56 +02:00
Colin Cross
befc483dfb Convert frameworks/minikin to Android.bp
See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I71d3406054b35dd4e8ae30f46eec6cef77eef160
Merged-In: I71d3406054b35dd4e8ae30f46eec6cef77eef160
2017-04-24 17:10:04 -07:00
Roozbeh Pournader
980c37e278 Add exception for Bulgarian to mk_hyb_file
am: 131392748f

Change-Id: I551c3cae80bf13ca43f13548777691b244197df1
2017-02-24 14:41:45 +00:00
Roozbeh Pournader
131392748f Add exception for Bulgarian to mk_hyb_file
The Bulgarian hyphenation patterns contain a line consisting of '0ь0'
which has no practical effect on hyphenation. Add an exception in
roundtrip testing to make sure we don't fail while comparing our tables
with the input data.

Test: make -j works and creates .hyb files for bg and cu
Change-Id: Ia46b8a45fe522f5194d8105d31b34b0e27528cc9
(cherry picked from commit 6308ea4c4b4652f061a646d164d5fdc941a25ba2)
2017-02-24 13:04:41 +00:00
Mark Salyzyn
9773115ad4 minikin: use log/log.h when utilizing ALOG macros am: 707bbae8ff am: 02c6dfea83
am: 869ad0c290

Change-Id: Ia4f4b30a4466a007c15f7606485611db9b168056
2017-01-10 16:09:13 +00:00
Mark Salyzyn
869ad0c290 minikin: use log/log.h when utilizing ALOG macros am: 707bbae8ff
am: 02c6dfea83

Change-Id: I228e76e2fffcab14996e38f19687e393985e2da0
2017-01-10 16:03:42 +00:00
Mark Salyzyn
02c6dfea83 minikin: use log/log.h when utilizing ALOG macros
am: 707bbae8ff

Change-Id: Ia5fd49e48b3223a708739782d6694d63d2932e48
2017-01-10 15:58:41 +00:00
Mark Salyzyn
707bbae8ff minikin: use log/log.h when utilizing ALOG macros
Use log/log.h to harden code against liblog changes.

Test: compile
Bug: 30465923
Change-Id: I3dea82e76d28d9ef52d7c0f11e038c4298863eb9
2017-01-09 13:33:48 -08:00
Mark Salyzyn
fbec42b214 minikin: Replace cutils/log.h with android/log.h or log/log.h am: ff6cd90494 am: bc2dbaa9bf
am: 782d509a49

Change-Id: I97e1031fbf52cac46997e55444918d7c43abeb75
2016-12-28 21:32:23 +00:00
Mark Salyzyn
782d509a49 minikin: Replace cutils/log.h with android/log.h or log/log.h am: ff6cd90494
am: bc2dbaa9bf

Change-Id: Ie77d0b3e90aeafeef05b427750c04d5589a340dc
2016-12-28 21:24:57 +00:00
Mark Salyzyn
bc2dbaa9bf minikin: Replace cutils/log.h with android/log.h or log/log.h
am: ff6cd90494

Change-Id: I9bb9b1afaa27c1d5924c6d3888861dea1ff3c18b
2016-12-28 21:17:22 +00:00
Mark Salyzyn
ff6cd90494 minikin: Replace cutils/log.h with android/log.h or log/log.h
- replace cutils/log.h with android/log.h (main buffer logging)
- replace cutils/log.h with log.log.h (+SafetyNet logging)
- define LOG_TAG before use.

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I7a4803dd66f31b7103e09e5ff5b8fa523fa0fd60
2016-12-27 10:10:18 -08:00
Dan Willemsen
1e8d13909a Use LOCAL_TEST_DATA to install test data am: 7e38090b57 am: 62047ccb25
am: 4c1fe1e28c

Change-Id: I3d7dd7c58c544e90176f25cac568c10facce726b
2016-12-15 20:32:52 +00:00
Dan Willemsen
4c1fe1e28c Use LOCAL_TEST_DATA to install test data am: 7e38090b57
am: 62047ccb25

Change-Id: Ie02fbdc89e59707c899175dadb9700a4873f8010
2016-12-15 20:25:53 +00:00
Dan Willemsen
62047ccb25 Use LOCAL_TEST_DATA to install test data
am: 7e38090b57

Change-Id: I09c27394d95417a0bb8b0ee8a48580e6e88dc8c6
2016-12-15 20:18:22 +00:00
Dan Willemsen
7e38090b57 Use LOCAL_TEST_DATA to install test data
This will handle installation for local builds as well as for the test
bundles.

Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Test: /data/nativetest{,64}/minikin_tests/minikin_tests
Change-Id: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
Merged-In: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
2016-12-15 18:47:17 +00:00
Colin Cross
8dc83b4547 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: 8d6a018645 am: 77f96edc2f
am: 03959097a9

Change-Id: I5bd69940f0e495119dd6154fb9e1efe34fa9a062
2016-12-09 02:10:36 +00:00
Colin Cross
03959097a9 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: 8d6a018645
am: 77f96edc2f

Change-Id: I1e38ef5ae3a4d6a977df856abbb160b2e5fcde4e
2016-12-09 02:05:35 +00:00
Colin Cross
77f96edc2f Merge "Move LOCAL_PICKUP_FILES out of $OUT/data"
am: 8d6a018645

Change-Id: I0aac6741d2c92bbe46fdf89931460fbb41acc1ea
2016-12-09 02:01:37 +00:00
Colin Cross
8d6a018645 Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" 2016-12-09 01:53:13 +00:00
Colin Cross
be7c33a74e Move LOCAL_PICKUP_FILES out of $OUT/data
minikin_tests was copying its test data to
$OUT/data/DATA/nativetest/minikin_test, and then packaging that with
LOCAL_PICKUP_FILES=$OUT/data/DATA, which would also pick up anything
any other module copyied to $OUT/data/DATA.  $OUT/data/DATA isn't
where the tests expect to find their data, they look in
/data/nativetest/minikin_test.  Copy the files to the intermediates
directory instead.

A future change will install LOCAL_PICKUP_FILES for local builds
to the correct place, so adb sync and
adb shell /data/nativetest/minikin_tests/minikin_tests will run the
tests.

Test: mma -j
Change-Id: I808ce743f51e5ccac711e22821e7e0d7cd94ffdf
2016-12-02 18:04:42 -08:00
Dan Willemsen
b4c239f555 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: f8ca78ffa4 am: 90f9f8d7a2
am: e2217d5b85

Change-Id: I346fddaa5822eee2371d877a8bdeb055b6244c0d
2016-09-13 03:58:51 +00:00
Dan Willemsen
e2217d5b85 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: f8ca78ffa4
am: 90f9f8d7a2

Change-Id: Ia8b56a95d11d74af5a2cac1fe8e604532c44a9cf
2016-09-13 03:56:10 +00:00
Dan Willemsen
90f9f8d7a2 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
am: f8ca78ffa4

Change-Id: Ia005ecb8dedc90aa8a908edda839da563152e861
2016-09-13 03:51:13 +00:00
Dan Willemsen
f8ca78ffa4 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" 2016-09-13 03:47:02 +00:00
Elliott Hughes
b150a633ba Switch minikin to std::unique_ptr. am: fba88d3b3c am: c5e0585ac7
am: 83bdd0ae73

Change-Id: I9c0b81d55e01b08b053a7031a214626351244607
2016-09-13 01:29:45 +00:00
Elliott Hughes
83bdd0ae73 Switch minikin to std::unique_ptr. am: fba88d3b3c
am: c5e0585ac7

Change-Id: Ie9f9aac239cb29568819de699e4999989a7a11bf
2016-09-13 01:27:07 +00:00
Elliott Hughes
c5e0585ac7 Switch minikin to std::unique_ptr.
am: fba88d3b3c

Change-Id: I91198bdae7aac9638e6ef3553b0eacac021d4f93
2016-09-13 01:24:37 +00:00
Elliott Hughes
fba88d3b3c Switch minikin to std::unique_ptr.
Bug: http://b/22403888
Change-Id: I9e18496fcc38ad2e6b922455daa9f2a46778ec55
2016-09-12 15:29:35 -07:00
Dan Willemsen
b4f4c16d32 Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n
These modules can be named the same between the target and host
libraries, which simplifies references to them, particularly in
Soong.

To prevent accidentally loading the system copy of the library,
we still rename the installed name to be libicu*-host.so. But
modules do not need to know that in order to build against them.

Change-Id: Ic38499bb236ace75333a84f23798af023e14cf5f
2016-09-12 14:37:02 -07:00
Chih-Hung Hsieh
a061ed7415 Fix google-explicit-constructor warnings in minikin am: 32252e357f -s ours am: 58514b3cce
am: 83c5cedc63

Change-Id: I3623a0f372da99c5a189bc5900b3f55bc3d7b0be
2016-08-16 21:14:54 +00:00
Chih-Hung Hsieh
83c5cedc63 Fix google-explicit-constructor warnings in minikin am: 32252e357f -s ours
am: 58514b3cce

Change-Id: Idf3e3882894774d917166e4eec743fb8bea0c31b
2016-08-16 21:13:13 +00:00
Chih-Hung Hsieh
58514b3cce Fix google-explicit-constructor warnings in minikin
am: 32252e357f  -s ours

Change-Id: I51c71217e402c3cbeefd6de5ccf7252dc1687f76
2016-08-16 21:08:26 +00:00
Chih-Hung Hsieh
32252e357f Fix google-explicit-constructor warnings in minikin
* Add explicit keyword to conversion constructors,
  or add NOLINT(implicit) for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
Merged-In: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
2016-08-16 01:48:48 +00:00
Roozbeh Pournader
777a92cefa Revert "Lookup glyph from color emoji font before and after ZWJ." am: 96fa633577
am: 01be577f0e

Change-Id: Id1b94e72ccd480bf5395752868f7f26e17ab7491
2016-08-11 23:36:50 +00:00
Roozbeh Pournader
01be577f0e Revert "Lookup glyph from color emoji font before and after ZWJ."
am: 96fa633577

Change-Id: Icc8b76ebd3edfdeb7622bf21a6585b191cf5b15f
2016-08-11 23:32:49 +00:00
Roozbeh Pournader
96fa633577 Revert "Lookup glyph from color emoji font before and after ZWJ."
This reverts commit 56bda7e82a59b3fcaa828960deeb2a766f8afdfe.

Bug: 30815709
Change-Id: I057d9bcd05246e58894abb4e9633bd10f6fab211
2016-08-11 21:03:00 +00:00
Seigo Nonaka
8072cf551c Lookup glyph from color emoji font before and after ZWJ.
am: 56bda7e82a

Change-Id: Ic4900b65ed16a2ba3b5431d12a093654b7921a9b
2016-07-14 22:43:47 +00:00
Seigo Nonaka
9c9c199f65 Treat U+2695, U+2640, U+2642 as emoji characters.
am: c5d673d423

Change-Id: I551ee1c4c5368dde3bf2ab7d016634991b62f212
2016-07-14 22:43:47 +00:00
Seigo Nonaka
e74b7cfd5e Add some gender balanced components in to the sticky whitelist.
am: 2fd057eb70

Change-Id: Ieda8b25bba40f22c9d8c33aba590e96e3396f6c4
2016-07-14 22:43:46 +00:00
Seigo Nonaka
56bda7e82a Lookup glyph from color emoji font before and after ZWJ.
Unicode recommends that the zwj sequences should be emoji presentation
even if they don't have the proper U+FE0F. Thus always lookup the glyph
for the code point before and after zwj as if they have a U+FE0F
variation selector.

Bug: 30056627
Change-Id: I03958a92337eaba4a8dd9c5be824b2665aa4a103
2016-07-13 14:12:06 -07:00
Seigo Nonaka
c5d673d423 Treat U+2695, U+2640, U+2642 as emoji characters.
Bug: 29885295
Change-Id: I1bf191a46d05e7099265d863bae0523c50817d0b
2016-07-13 14:05:02 -07:00
Seigo Nonaka
2fd057eb70 Add some gender balanced components in to the sticky whitelist.
FEMALE SIGN(U+2640), MALE SIGN(U+2642), StAFF OF AESCULAPIUS(U+2695)
will be used as the ZWJ sequenced in gender balanced emoji sequence.
To be in the same run with ZWJ, mark these emoji as sticky chracters.

With this fix, Female police officer sequence will be shown correctly
regardless of VS16.

Bug: 30026374
Change-Id: I503fc061eaa943d45208bb69e885151610c430ce
2016-07-13 14:01:41 -07:00
Roozbeh Pournader
b26b8dd05d Do not break after Myanmar viramas am: acaf5cc08d
am: 04b29bcbbb

* commit '04b29bcbbb55f0d39baa059b4bf5ea2a79f7b76f':

Change-Id: I4437e1206de2a45593e69956d8bcdf85a64b0f32
2016-05-26 02:31:31 +00:00
Roozbeh Pournader
e03c64d7b8 Do not break after Myanmar viramas am: acaf5cc08d
am: e04e0e9a43

* commit 'e04e0e9a4332ebf5966425ab22a9fdd7efc84c3b':
  Do not break after Myanmar viramas

Change-Id: I2e240fab84a49c73165056ee5ff18dbfca0faeec
2016-05-26 02:21:28 +00:00
Roozbeh Pournader
e04e0e9a43 Do not break after Myanmar viramas
am: acaf5cc08d

* commit 'acaf5cc08defe3dfaa1e0caa945be494532cbaa0':
  Do not break after Myanmar viramas

Change-Id: I13297120c3c3789c03b860c9e72b3a04922ab9fa
2016-05-26 01:44:33 +00:00
Roozbeh Pournader
04b29bcbbb Do not break after Myanmar viramas
am: acaf5cc08d

* commit 'acaf5cc08defe3dfaa1e0caa945be494532cbaa0':
  Do not break after Myanmar viramas

Change-Id: Idb9303889ac87853a730cdb25fba7faaaf352b93
2016-05-26 01:44:33 +00:00
Roozbeh Pournader
acaf5cc08d Do not break after Myanmar viramas
This is to work around a bug in ICU's line breaker, which thinks
there is a valid line break between a Myanmar kinzi and a consonant.
See http://bugs.icu-project.org/trac/ticket/12561 for the ICU bug.

Bug: 28964845
Change-Id: I076ac15077e5627cbccf6732900bcc60d8596dda
2016-05-25 16:46:56 -07:00
Seigo Nonaka
4c1c042046 Do not break before and after ZWJ. am: 47932fa
am: 3a0a3c1

* commit '3a0a3c123832f99de7cbb28ec968eca0b1bf437f':

Change-Id: I5a637871133d3e45c47c5b6dc8407bda946dbd62
2016-04-19 18:46:15 +00:00
Seigo Nonaka
d4a4d289a6 Do not break before and after ZWJ. am: 47932fa
am: 65429ac

* commit '65429ac4cef1f8f5daecbbc712313b59185a9789':
  Do not break before and after ZWJ.

Change-Id: If1fe6c6192aae09bab68a00bc94aba3e768dd445
2016-04-19 18:42:30 +00:00