Changes the filter rules to support required units Preparation work to implement Unified Intl.NumberFormat Feature Proposal. Add all units in https://github.com/tc39/proposal-unified-intl-numberformat/pull/42 Size Impact: No size changes to common, cast, flutter Minor (0.3K - 10K) increase to chromeos, android and ios Buil BEFORE AFTER INCREASE chromeos 10394080 10405072 10992 android 7760528 7767088 6560 android_small 6420432 6420784 352 ios 6372800 6373152 352 Bug: v8:8515 Change-Id: I0a48d416bb4cf794233ca04853e4cd9c9825f237 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/deps/icu/+/1614319 Reviewed-by: Jungshik Shin <jshin@chromium.org>
diff --git a/android/icudtl.dat b/android/icudtl.dat index dcab1a9..105fa17 100644 --- a/android/icudtl.dat +++ b/android/icudtl.dat Binary files differ
diff --git a/android_small/icudtl.dat b/android_small/icudtl.dat index 1bb3522..5cade61 100644 --- a/android_small/icudtl.dat +++ b/android_small/icudtl.dat Binary files differ
diff --git a/chromeos/icudtl.dat b/chromeos/icudtl.dat index f0d4aca..aacb474 100644 --- a/chromeos/icudtl.dat +++ b/chromeos/icudtl.dat Binary files differ
diff --git a/filters/android.json b/filters/android.json index 38be85f..0297ce7 100644 --- a/filters/android.json +++ b/filters/android.json
@@ -1246,34 +1246,118 @@ "-/units", "-/unitsNarrow", "-/unitsShort", - "+/*/acceleration", - "-/*/acceleration/*/dnam", +// "-/*/acceleration", // "-/*/angle", -// "-/*/area", + "+/*/angle/degree", + "-/*/angle/degree/dnam", + "+/*/area/acre", + "-/*/area/acre/dnam", +// "-/*/area/dunam", + "+/*/area/hectare", + "-/*/area/hectare/dnam", +// "-/*/area/square-centimeter", +// "-/*/area/square-foot", +// "-/*/area/square-inch", +// "-/*/area/square-kilometer", +// "-/*/area/square-meter", +// "-/*/area/square-mile", +// "-/*/area/square-yard", "+/*/compound", "-/*/compound/*/dnam", -// "+/*/concentr", - "+/*/concentr/percent", - "-/*/concentr/percent/dnam", + "+/*/concentr", + "-/*/concentr/*/dnam", // "+/*/consumption", // "+/*/coordinate", "+/*/digital", "-/*/digital/*/dnam", - "+/*/duration", - "-/*/duration/*/dnam", +// "+/*/duration/century", + "+/*/duration/day", + "-/*/duration/day/dnam", + "+/*/duration/hour", + "-/*/duration/hour/dnam", + "+/*/duration/microsecond", + "-/*/duration/microsecond/dnam", + "+/*/duration/millisecond", + "-/*/duration/millisecond/dnam", + "+/*/duration/minute", + "-/*/duration/minute/dnam", + "+/*/duration/month", + "-/*/duration/month/dnam", + "+/*/duration/nanosecond", + "-/*/duration/nanosecond/dnam", + "+/*/duration/second", + "-/*/duration/second/dnam", + "+/*/duration/week", + "-/*/duration/week/dnam", + "+/*/duration/year", + "-/*/duration/year/dnam", // "+/*/electric", // "+/*/energy", // "+/*/force", - "+/*/frequency", - "-/*/frequency/*/dnam", - "+/*/length", - "-/*/length/*/dnam", -// "+/*/mass", +// "+/*/frequency", +// "+/*/length/astronomical-unit", + "+/*/length/centimeter", + "-/*/length/centimeter/dnam", +// "+/*/length/decimeter", +// "+/*/length/fathom", + "+/*/length/foot", + "-/*/length/foot/dnam", +// "+/*/length/furlong", + "+/*/length/inch", + "-/*/length/inch/dnam", + "+/*/length/kilometer", + "-/*/length/kilometer/dnam", +// "+/*/length/light-year", + "+/*/length/meter", + "-/*/length/meter/dnam", +// "+/*/length/micrometer", + "+/*/length/mile", + "-/*/length/mile/dnam", + "+/*/length/mile-scandinavian", + "-/*/length/mile-scandinavian/dnam", + "+/*/length/millimeter", + "-/*/length/millimeter/dnam", +// "+/*/length/nanometer", +// "+/*/length/nautical-mile", +// "+/*/length/parsec", +// "+/*/length/picometer", +// "+/*/length/point", +// "+/*/length/solar-radius", +// "+/*/length/yard", +// "+/*/mass/carat", +// "+/*/mass/dalton", +// "+/*/mass/earth-mass", + "+/*/mass/gram", + "-/*/mass/gram/dnam", + "+/*/mass/kilogram", + "-/*/mass/kilogram/dnam", +// "+/*/mass/metric-ton", +// "+/*/mass/microgram", +// "+/*/mass/milligram", + "+/*/mass/ounce", + "-/*/mass/ounce/dnam", +// "+/*/mass/ounce-troy", + "+/*/mass/pound", + "-/*/mass/pound/dnam", +// "+/*/mass/solar-mass", + "+/*/mass/stone", + "-/*/mass/stone/dnam", +// "+/*/mass/ton", // "+/*/power", // "+/*/pressure", -// "+/*/speed", - "+/*/temperature", - "-/*/temperature/*/dnam" + "+/*/speed/kilometer-per-hour", + "-/*/speed/kilometer-per-hour/dnam", +// "+/*/speed/knot", + "+/*/speed/meter-per-second", + "-/*/speed/meter-per-second/dnam", + "+/*/speed/mile-per-hour", + "-/*/speed/mile-per-hour/dnam", + "+/*/temperature/celsius", + "-/*/temperature/celsius/dnam", + "+/*/temperature/fahrenheit", + "-/*/temperature/fahrenheit/dnam", + "+/*/temperature/kelvin", + "-/*/temperature/kelvin/dnam" // "+/*/torque", // "+/*/volume", ]
diff --git a/filters/android_small.json b/filters/android_small.json index e002a07..613c4b3 100644 --- a/filters/android_small.json +++ b/filters/android_small.json
@@ -1263,34 +1263,118 @@ "-/units", "-/unitsNarrow", "-/unitsShort", - "+/*/acceleration", - "-/*/acceleration/*/dnam", +// "-/*/acceleration", // "-/*/angle", -// "-/*/area", + "+/*/angle/degree", + "-/*/angle/degree/dnam", + "+/*/area/acre", + "-/*/area/acre/dnam", +// "-/*/area/dunam", + "+/*/area/hectare", + "-/*/area/hectare/dnam", +// "-/*/area/square-centimeter", +// "-/*/area/square-foot", +// "-/*/area/square-inch", +// "-/*/area/square-kilometer", +// "-/*/area/square-meter", +// "-/*/area/square-mile", +// "-/*/area/square-yard", "+/*/compound", "-/*/compound/*/dnam", -// "+/*/concentr", - "+/*/concentr/percent", - "-/*/concentr/percent/dnam", + "+/*/concentr", + "-/*/concentr/*/dnam", // "+/*/consumption", // "+/*/coordinate", "+/*/digital", "-/*/digital/*/dnam", - "+/*/duration", - "-/*/duration/*/dnam", +// "+/*/duration/century", + "+/*/duration/day", + "-/*/duration/day/dnam", + "+/*/duration/hour", + "-/*/duration/hour/dnam", + "+/*/duration/microsecond", + "-/*/duration/microsecond/dnam", + "+/*/duration/millisecond", + "-/*/duration/millisecond/dnam", + "+/*/duration/minute", + "-/*/duration/minute/dnam", + "+/*/duration/month", + "-/*/duration/month/dnam", + "+/*/duration/nanosecond", + "-/*/duration/nanosecond/dnam", + "+/*/duration/second", + "-/*/duration/second/dnam", + "+/*/duration/week", + "-/*/duration/week/dnam", + "+/*/duration/year", + "-/*/duration/year/dnam", // "+/*/electric", // "+/*/energy", // "+/*/force", - "+/*/frequency", - "-/*/frequency/*/dnam", - "+/*/length", - "-/*/length/*/dnam", -// "+/*/mass", +// "+/*/frequency", +// "+/*/length/astronomical-unit", + "+/*/length/centimeter", + "-/*/length/centimeter/dnam", +// "+/*/length/decimeter", +// "+/*/length/fathom", + "+/*/length/foot", + "-/*/length/foot/dnam", +// "+/*/length/furlong", + "+/*/length/inch", + "-/*/length/inch/dnam", + "+/*/length/kilometer", + "-/*/length/kilometer/dnam", +// "+/*/length/light-year", + "+/*/length/meter", + "-/*/length/meter/dnam", +// "+/*/length/micrometer", + "+/*/length/mile", + "-/*/length/mile/dnam", + "+/*/length/mile-scandinavian", + "-/*/length/mile-scandinavian/dnam", + "+/*/length/millimeter", + "-/*/length/millimeter/dnam", +// "+/*/length/nanometer", +// "+/*/length/nautical-mile", +// "+/*/length/parsec", +// "+/*/length/picometer", +// "+/*/length/point", +// "+/*/length/solar-radius", +// "+/*/length/yard", +// "+/*/mass/carat", +// "+/*/mass/dalton", +// "+/*/mass/earth-mass", + "+/*/mass/gram", + "-/*/mass/gram/dnam", + "+/*/mass/kilogram", + "-/*/mass/kilogram/dnam", +// "+/*/mass/metric-ton", +// "+/*/mass/microgram", +// "+/*/mass/milligram", + "+/*/mass/ounce", + "-/*/mass/ounce/dnam", +// "+/*/mass/ounce-troy", + "+/*/mass/pound", + "-/*/mass/pound/dnam", +// "+/*/mass/solar-mass", + "+/*/mass/stone", + "-/*/mass/stone/dnam", +// "+/*/mass/ton", // "+/*/power", // "+/*/pressure", -// "+/*/speed", - "+/*/temperature", - "-/*/temperature/*/dnam" + "+/*/speed/kilometer-per-hour", + "-/*/speed/kilometer-per-hour/dnam", +// "+/*/speed/knot", + "+/*/speed/meter-per-second", + "-/*/speed/meter-per-second/dnam", + "+/*/speed/mile-per-hour", + "-/*/speed/mile-per-hour/dnam", + "+/*/temperature/celsius", + "-/*/temperature/celsius/dnam", + "+/*/temperature/fahrenheit", + "-/*/temperature/fahrenheit/dnam", + "+/*/temperature/kelvin", + "-/*/temperature/kelvin/dnam" // "+/*/torque", // "+/*/volume", ]
diff --git a/filters/chromeos.json b/filters/chromeos.json index d3de23c..317f0bc 100644 --- a/filters/chromeos.json +++ b/filters/chromeos.json
@@ -1568,29 +1568,113 @@ "-/unitsShort", // "-/*/acceleration", // "-/*/angle", -// "-/*/area", + "+/*/angle/degree", + "-/*/angle/degree/dnam", + "+/*/area/acre", + "-/*/area/acre/dnam", +// "-/*/area/dunam", + "+/*/area/hectare", + "-/*/area/hectare/dnam", +// "-/*/area/square-centimeter", +// "-/*/area/square-foot", +// "-/*/area/square-inch", +// "-/*/area/square-kilometer", +// "-/*/area/square-meter", +// "-/*/area/square-mile", +// "-/*/area/square-yard", "+/*/compound", "-/*/compound/*/dnam", "+/*/concentr", "-/*/concentr/*/dnam", // "+/*/consumption", // "+/*/coordinate", -// "+/*/digital", - "+/*/duration", - "-/*/duration/*/dnam", - "+/*/electric", - "-/*/electric/*/dnam", + "+/*/digital", + "-/*/digital/*/dnam", +// "+/*/duration/century", + "+/*/duration/day", + "-/*/duration/day/dnam", + "+/*/duration/hour", + "-/*/duration/hour/dnam", +// "+/*/duration/microsecond", + "+/*/duration/millisecond", + "-/*/duration/millisecond/dnam", + "+/*/duration/minute", + "-/*/duration/minute/dnam", + "+/*/duration/month", + "-/*/duration/month/dnam", +// "+/*/duration/nanosecond", + "+/*/duration/second", + "-/*/duration/second/dnam", + "+/*/duration/week", + "-/*/duration/week/dnam", + "+/*/duration/year", + "-/*/duration/year/dnam", +// "+/*/electric", // "+/*/energy", // "+/*/force", // "+/*/frequency", - "+/*/length", - "-/*/length/*/dnam", -// "+/*/mass", +// "+/*/length/astronomical-unit", + "+/*/length/centimeter", + "-/*/length/centimeter/dnam", +// "+/*/length/decimeter", +// "+/*/length/fathom", + "+/*/length/foot", + "-/*/length/foot/dnam", +// "+/*/length/furlong", + "+/*/length/inch", + "-/*/length/inch/dnam", + "+/*/length/kilometer", + "-/*/length/kilometer/dnam", +// "+/*/length/light-year", + "+/*/length/meter", + "-/*/length/meter/dnam", +// "+/*/length/micrometer", + "+/*/length/mile", + "-/*/length/mile/dnam", + "+/*/length/mile-scandinavian", + "-/*/length/mile-scandinavian/dnam", + "+/*/length/millimeter", + "-/*/length/millimeter/dnam", +// "+/*/length/nanometer", +// "+/*/length/nautical-mile", +// "+/*/length/parsec", +// "+/*/length/picometer", +// "+/*/length/point", +// "+/*/length/solar-radius", +// "+/*/length/yard", +// "+/*/mass/carat", +// "+/*/mass/dalton", +// "+/*/mass/earth-mass", + "+/*/mass/gram", + "-/*/mass/gram/dnam", + "+/*/mass/kilogram", + "-/*/mass/kilogram/dnam", +// "+/*/mass/metric-ton", +// "+/*/mass/microgram", +// "+/*/mass/milligram", + "+/*/mass/ounce", + "-/*/mass/ounce/dnam", +// "+/*/mass/ounce-troy", + "+/*/mass/pound", + "-/*/mass/pound/dnam", +// "+/*/mass/solar-mass", + "+/*/mass/stone", + "-/*/mass/stone/dnam", +// "+/*/mass/ton", // "+/*/power", // "+/*/pressure", -// "+/*/speed", - "+/*/temperature", - "-/*/temperature/*/dnam" + "+/*/speed/kilometer-per-hour", + "-/*/speed/kilometer-per-hour/dnam", +// "+/*/speed/knot", + "+/*/speed/meter-per-second", + "-/*/speed/meter-per-second/dnam", + "+/*/speed/mile-per-hour", + "-/*/speed/mile-per-hour/dnam", + "+/*/temperature/celsius", + "-/*/temperature/celsius/dnam", + "+/*/temperature/fahrenheit", + "-/*/temperature/fahrenheit/dnam" +// "+/*/temperature/kelvin", // "+/*/torque", // "+/*/volume", ]
diff --git a/filters/ios.json b/filters/ios.json index c031970..7e76e57 100644 --- a/filters/ios.json +++ b/filters/ios.json
@@ -1268,34 +1268,118 @@ "-/units", "-/unitsNarrow", "-/unitsShort", - "+/*/acceleration", - "-/*/acceleration/*/dnam", +// "-/*/acceleration", // "-/*/angle", -// "-/*/area", + "+/*/angle/degree", + "-/*/angle/degree/dnam", + "+/*/area/acre", + "-/*/area/acre/dnam", +// "-/*/area/dunam", + "+/*/area/hectare", + "-/*/area/hectare/dnam", +// "-/*/area/square-centimeter", +// "-/*/area/square-foot", +// "-/*/area/square-inch", +// "-/*/area/square-kilometer", +// "-/*/area/square-meter", +// "-/*/area/square-mile", +// "-/*/area/square-yard", "+/*/compound", "-/*/compound/*/dnam", -// "+/*/concentr", - "+/*/concentr/percent", - "-/*/concentr/percent/dnam", + "+/*/concentr", + "-/*/concentr/*/dnam", // "+/*/consumption", // "+/*/coordinate", "+/*/digital", "-/*/digital/*/dnam", - "+/*/duration", - "-/*/duration/*/dnam", +// "+/*/duration/century", + "+/*/duration/day", + "-/*/duration/day/dnam", + "+/*/duration/hour", + "-/*/duration/hour/dnam", + "+/*/duration/microsecond", + "-/*/duration/microsecond/dnam", + "+/*/duration/millisecond", + "-/*/duration/millisecond/dnam", + "+/*/duration/minute", + "-/*/duration/minute/dnam", + "+/*/duration/month", + "-/*/duration/month/dnam", + "+/*/duration/nanosecond", + "-/*/duration/nanosecond/dnam", + "+/*/duration/second", + "-/*/duration/second/dnam", + "+/*/duration/week", + "-/*/duration/week/dnam", + "+/*/duration/year", + "-/*/duration/year/dnam", // "+/*/electric", // "+/*/energy", // "+/*/force", - "+/*/frequency", - "-/*/frequency/*/dnam", - "+/*/length", - "-/*/length/*/dnam", -// "+/*/mass", +// "+/*/frequency", +// "+/*/length/astronomical-unit", + "+/*/length/centimeter", + "-/*/length/centimeter/dnam", +// "+/*/length/decimeter", +// "+/*/length/fathom", + "+/*/length/foot", + "-/*/length/foot/dnam", +// "+/*/length/furlong", + "+/*/length/inch", + "-/*/length/inch/dnam", + "+/*/length/kilometer", + "-/*/length/kilometer/dnam", +// "+/*/length/light-year", + "+/*/length/meter", + "-/*/length/meter/dnam", +// "+/*/length/micrometer", + "+/*/length/mile", + "-/*/length/mile/dnam", + "+/*/length/mile-scandinavian", + "-/*/length/mile-scandinavian/dnam", + "+/*/length/millimeter", + "-/*/length/millimeter/dnam", +// "+/*/length/nanometer", +// "+/*/length/nautical-mile", +// "+/*/length/parsec", +// "+/*/length/picometer", +// "+/*/length/point", +// "+/*/length/solar-radius", +// "+/*/length/yard", +// "+/*/mass/carat", +// "+/*/mass/dalton", +// "+/*/mass/earth-mass", + "+/*/mass/gram", + "-/*/mass/gram/dnam", + "+/*/mass/kilogram", + "-/*/mass/kilogram/dnam", +// "+/*/mass/metric-ton", +// "+/*/mass/microgram", +// "+/*/mass/milligram", + "+/*/mass/ounce", + "-/*/mass/ounce/dnam", +// "+/*/mass/ounce-troy", + "+/*/mass/pound", + "-/*/mass/pound/dnam", +// "+/*/mass/solar-mass", + "+/*/mass/stone", + "-/*/mass/stone/dnam", +// "+/*/mass/ton", // "+/*/power", // "+/*/pressure", -// "+/*/speed", - "+/*/temperature", - "-/*/temperature/*/dnam" + "+/*/speed/kilometer-per-hour", + "-/*/speed/kilometer-per-hour/dnam", +// "+/*/speed/knot", + "+/*/speed/meter-per-second", + "-/*/speed/meter-per-second/dnam", + "+/*/speed/mile-per-hour", + "-/*/speed/mile-per-hour/dnam", + "+/*/temperature/celsius", + "-/*/temperature/celsius/dnam", + "+/*/temperature/fahrenheit", + "-/*/temperature/fahrenheit/dnam", + "+/*/temperature/kelvin", + "-/*/temperature/kelvin/dnam" // "+/*/torque", // "+/*/volume", ]
diff --git a/ios/icudtl.dat b/ios/icudtl.dat index 3e34525..12daf91 100644 --- a/ios/icudtl.dat +++ b/ios/icudtl.dat Binary files differ