diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-21 08:26:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-21 08:26:48 +0000 |
commit | 0012ad2e9d2b3b624c308a20ae8dd26c8338d69d (patch) | |
tree | c9d79eba1c252af40c6da13828e2fc805bb481ca | |
parent | 67886d2ea60a7ff3b3e742044b7b03924c8e0d8c (diff) | |
parent | 529c695aed8e1e79bc60a5d8870c18a8d69d5a8b (diff) | |
download | icu-0012ad2e9d2b3b624c308a20ae8dd26c8338d69d.tar.gz |
Snap for 4613997 from 529c695aed8e1e79bc60a5d8870c18a8d69d5a8b to pi-release
Change-Id: I6b5a8cf75e066495000555511de6db0708273504
-rw-r--r-- | android_icu4j/Android.bp | 10 | ||||
-rw-r--r-- | icu4c/source/data/misc/zoneinfo64.txt | 46 | ||||
-rw-r--r-- | icu4c/source/stubdata/icudt60l.dat | bin | 24024752 -> 24024784 bytes | |||
-rw-r--r-- | icu4c/source/tools/tzcode/Makefile.in | 2 | ||||
-rw-r--r-- | icu4j/main/shared/data/icutzdata.jar | bin | 92700 -> 92733 bytes |
5 files changed, 35 insertions, 23 deletions
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp index ab2b6be1b..8a579ae74 100644 --- a/android_icu4j/Android.bp +++ b/android_icu4j/Android.bp @@ -30,3 +30,13 @@ filegroup { srcs: ["resources/**/*"], path: "resources", } + +filegroup { + name: "android_icu4j_src_files_for_docs", + srcs: [ + "src/main/java/android/icu/lang/**/*.java", + "src/main/java/android/icu/math/**/*.java", + "src/main/java/android/icu/text/**/*.java", + "src/main/java/android/icu/util/**/*.java", + ], +} diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index 7d96ccdc5..e2ad5585f 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,7 +3,7 @@ // License & terms of use: http://www.unicode.org/copyright.html#License //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Jan 24 19:35:59 2018 +// Build date: Mon Feb 19 16:50:36 2018 // tz database: ftp://ftp.iana.org/tz/ // tz version: 2018c // ICU version: 60.2 @@ -730,7 +730,7 @@ zoneinfo64:table(nofallback) { finalRule { "US" } finalRaw:int { -28800 } finalYear:int { 2008 } - links:intvector { 151, 548, 624 } + links:intvector { 151, 548, 624, 625 } } //Z#151 /* America/Louisville */ :int { 145 } //Z#152 /* America/Lower_Princes */ :int { 105 } //Z#153 @@ -1403,7 +1403,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -2004073600, -1851577590, -852105600, -782643600, -767869200, -718095600, -457776000, -315648000, 171820800 } typeOffsets:intvector { 25600, 0, 25200, 0, 25590, 0, 28800, 0, 32400, 0 } typeMap:bin { "020103040103010301" } - links:intvector { 271, 309, 628 } + links:intvector { 271, 309, 629 } } //Z#271 /* Asia/Hong_Kong */ :table { trans:intvector { -2056693002, -907389000, -891667800, -884246400, -766746000, -747981000, -728544600, -717049800, -694503000, -683785800, -668064600, -654755400, -636615000, -623305800, -605165400, -591856200, -573715800, -559801800, -542352600, -528352200, -510211800, -498112200, -478762200, -466662600, -446707800, -435213000, -415258200, -403158600, -383808600, -371709000, -352359000, -340259400, -320909400, -308809800, -288855000, -277360200, -257405400, -245910600, -225955800, -213856200, -194506200, -182406600, -163056600, -148537800, -132816600, -117088200, -101367000, -85638600, -69312600, -53584200, -37863000, -22134600, -6413400, 9315000, 25036200, 40764600, 56485800, 72214200, 88540200, 104268600, 119989800, 126041400, 151439400, 167167800, 182889000, 198617400, 214338600, 295385400, 309292200 } @@ -2039,7 +2039,7 @@ zoneinfo64:table(nofallback) { } //Z#433 /* Etc/UTC */ :table { typeOffsets:intvector { 0, 0 } - links:intvector { 434, 435, 437, 626, 627, 631 } + links:intvector { 434, 435, 437, 627, 628, 632 } } //Z#434 /* Etc/Universal */ :int { 434 } //Z#435 /* Etc/Unknown */ :table { @@ -2266,7 +2266,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1688265017, -1656819079, -1641353479, -1627965079, -1618716679, -1596429079, -1593820800, -1589860800, -1542427200, -1539493200, -1525323600, -1522728000, -1491188400, -1247536800, 354920400, 370728000, 386456400, 402264000, 417992400, 433800000, 449614800, 465346800, 481071600, 496796400, 512521200, 528246000, 543970800, 559695600, 575420400, 591145200, 606870000, 622594800, 638319600, 654649200, 670374000, 686102400, 695779200, 701823600, 717548400, 733273200, 748998000, 764722800, 780447600, 796172400, 811897200, 828226800, 846370800, 859676400, 877820400, 891126000, 909270000, 922575600, 941324400, 954025200, 972774000, 985474800, 1004223600, 1017529200, 1035673200, 1048978800, 1067122800, 1080428400, 1099177200, 1111878000, 1130626800, 1143327600, 1162076400, 1174777200, 1193526000, 1206831600, 1224975600, 1238281200, 1256425200, 1269730800, 1288479600, 1301180400, 1414274400 } typeOffsets:intvector { 9017, 0, 7200, 0, 7200, 3600, 9079, 0, 9079, 3600, 9079, 7200, 10800, 0, 10800, 3600, 10800, 7200, 14400, 0 } typeMap:bin { "0304030504050706070807060106070607060706070607060706070607060706070602010607060706070607060706070607060706070607060706070607060706070607060706070607060906" } - links:intvector { 471, 629 } + links:intvector { 471, 630 } } //Z#471 /* Europe/Nicosia */ :int { 297 } //Z#472 /* Europe/Oslo */ :table { @@ -2716,7 +2716,7 @@ zoneinfo64:table(nofallback) { trans:intvector { -1861879032 } typeOffsets:intvector { 45432, 0, -40968, 0, -39600, 0 } typeMap:bin { "0102" } - links:intvector { 572, 577, 585, 625 } + links:intvector { 572, 577, 585, 626 } } //Z#577 /* Pacific/Palau */ :table { transPre32:intvector { -1, 2117482220 } @@ -2871,11 +2871,12 @@ zoneinfo64:table(nofallback) { /* US/Michigan */ :int { 110 } //Z#622 /* US/Mountain */ :int { 109 } //Z#623 /* US/Pacific */ :int { 151 } //Z#624 - /* US/Samoa */ :int { 577 } //Z#625 - /* UTC */ :int { 434 } //Z#626 - /* Universal */ :int { 434 } //Z#627 - /* VST */ :int { 271 } //Z#628 - /* W-SU */ :int { 471 } //Z#629 + /* US/Pacific-New */ :int { 151 } //Z#625 + /* US/Samoa */ :int { 577 } //Z#626 + /* UTC */ :int { 434 } //Z#627 + /* Universal */ :int { 434 } //Z#628 + /* VST */ :int { 271 } //Z#629 + /* W-SU */ :int { 471 } //Z#630 /* WET */ :table { trans:intvector { 228877200, 243997200, 260326800, 276051600, 291776400, 307501200, 323830800, 338950800, 354675600, 370400400, 386125200, 401850000, 417574800, 433299600, 449024400, 465354000, 481078800, 496803600, 512528400, 528253200, 543978000, 559702800, 575427600, 591152400, 606877200, 622602000, 638326800, 654656400, 670381200, 686106000, 701830800, 717555600, 733280400, 749005200, 764730000, 780454800, 796179600, 811904400, 828234000, 846378000 } typeOffsets:intvector { 0, 0, 0, 3600 } @@ -2883,8 +2884,8 @@ zoneinfo64:table(nofallback) { finalRule { "EU" } finalRaw:int { 0 } finalYear:int { 1997 } - } //Z#630 - /* Zulu */ :int { 434 } //Z#631 + } //Z#631 + /* Zulu */ :int { 434 } //Z#632 } Names { "ACT","AET","AGT","ART","AST","Africa/Abidjan","Africa/Accra" // 6 @@ -3070,8 +3071,8 @@ zoneinfo64:table(nofallback) { ,"SystemV/YST9","SystemV/YST9YDT","Turkey","UCT","US/Alaska" // 614 ,"US/Aleutian","US/Arizona","US/Central","US/East-Indiana" // 618 ,"US/Eastern","US/Hawaii","US/Indiana-Starke","US/Michigan" // 622 - ,"US/Mountain","US/Pacific","US/Samoa","UTC","Universal" // 627 - ,"VST","W-SU","WET","Zulu" // 631 + ,"US/Mountain","US/Pacific","US/Pacific-New","US/Samoa" // 626 + ,"UTC","Universal","VST","W-SU","WET","Zulu" // 632 } Rules { AN:intvector { @@ -3794,12 +3795,13 @@ zoneinfo64:table(nofallback) { "US", //Z#622 US/Michigan "US", //Z#623 US/Mountain "US", //Z#624 US/Pacific - "AS", //Z#625 US/Samoa - "001",//Z#626 UTC - "001",//Z#627 Universal - "VN", //Z#628 VST - "RU", //Z#629 W-SU - "001",//Z#630 WET - "001",//Z#631 Zulu + "US", //Z#625 US/Pacific-New + "AS", //Z#626 US/Samoa + "001",//Z#627 UTC + "001",//Z#628 Universal + "VN", //Z#629 VST + "RU", //Z#630 W-SU + "001",//Z#631 WET + "001",//Z#632 Zulu } } diff --git a/icu4c/source/stubdata/icudt60l.dat b/icu4c/source/stubdata/icudt60l.dat Binary files differindex 2c7fdd3f5..3791e385c 100644 --- a/icu4c/source/stubdata/icudt60l.dat +++ b/icu4c/source/stubdata/icudt60l.dat diff --git a/icu4c/source/tools/tzcode/Makefile.in b/icu4c/source/tools/tzcode/Makefile.in index 280af4eb0..63c923008 100644 --- a/icu4c/source/tools/tzcode/Makefile.in +++ b/icu4c/source/tools/tzcode/Makefile.in @@ -105,7 +105,7 @@ $(ICUZDUMPOUT): $(ICUZDUMPEXEC) PRIMARY_YDATA= africa antarctica asia australasia \ europe northamerica southamerica -YDATA= $(PRIMARY_YDATA) etcetera factory backward +YDATA= $(PRIMARY_YDATA) pacificnew etcetera factory backward NDATA= systemv SDATA= solar87 solar88 solar89 #TDATA= $(YDATA) $(NDATA) $(SDATA) diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar Binary files differindex d8ea16d6d..4f379d126 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar |