From 108279e9e5be02b15c8000d99ce2e600c0bc97ec Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 30 Mar 2017 18:12:49 +0100 Subject: [PATCH] Addition of a new system file for time zone data This file is to replace the time_zones_by_country.xml file from frameworks/base/core/res/res/xml/ This new file is intended to be updated outside of an OTA, unlike time_zones_by_country.xml. The tzlookup.xml file is read by code in libcore, not frameworks/base. The format of the file is slightly different from time_zones_by_country.xml but the information is the same as the current version. It was generated using a sed transform and manual coallescing of the elements / comments: sed 's/$/\n /' frameworks/base/core/res/res/xml/time_zones_by_country.xml \ | sed 's/<\/timezones>/ <\/countryzones>\n<\/timezones>/' \ | sed 's/\)//g' \ | sed 's/<\/timezone>/<\/id>\n <\/country>/g' The time_zones_by_country.xml file will be deleted in a follow up change when the new code is wired into the code that uses this data. Test: See associated libcore change that will ensure the file is kept in sync with tzdata when applying IANA rules changes. Bug: 25338903 Change-Id: I8912307bf6a41750ac06ffce9143e8055ea4e7c5 --- libc/zoneinfo/Android.mk | 20 + libc/zoneinfo/tzlookup.xml | 1622 ++++++++++++++++++++++++++++++++++++ 2 files changed, 1642 insertions(+) create mode 100644 libc/zoneinfo/tzlookup.xml diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk index fe5099de7..faa1f0611 100644 --- a/libc/zoneinfo/Android.mk +++ b/libc/zoneinfo/Android.mk @@ -9,6 +9,15 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo include $(BUILD_PREBUILT) +include $(CLEAR_VARS) +LOCAL_MODULE := tzlookup.xml +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) + # The host build doesn't use bionic, but it does use bionic's zoneinfo data ifeq ($(WITH_HOST_DALVIK),true) @@ -23,4 +32,15 @@ LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo include $(BUILD_PREBUILT) +include $(CLEAR_VARS) +LOCAL_MODULE := tzlookup.xml-host +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_IS_HOST_MODULE := true +LOCAL_SRC_FILES := tzlookup.xml +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_STEM := $(LOCAL_SRC_FILES) +LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/zoneinfo +include $(BUILD_PREBUILT) + endif diff --git a/libc/zoneinfo/tzlookup.xml b/libc/zoneinfo/tzlookup.xml new file mode 100644 index 000000000..5846f5063 --- /dev/null +++ b/libc/zoneinfo/tzlookup.xml @@ -0,0 +1,1622 @@ + + + + + + + + + Europe/Andorra + + + + + Asia/Dubai + + + + + Asia/Kabul + + + + + America/Antigua + + + + + America/Anguilla + + + + + Europe/Tirane + + + + + Asia/Yerevan + + + + + Africa/Luanda + + + + + + Antarctica/McMurdo + + + Antarctica/DumontDUrville + + + Antarctica/Casey + + + Antarctica/Davis + + + Antarctica/Mawson + + + Antarctica/Vostok + + + Antarctica/Syowa + + + Antarctica/Troll + + + Antarctica/Rothera + + + Antarctica/Palmer + + + + + America/Argentina/Buenos_Aires + America/Argentina/Cordoba + America/Argentina/Salta + America/Argentina/Jujuy + America/Argentina/Tucuman + America/Argentina/Catamarca + America/Argentina/La_Rioja + America/Argentina/San_Juan + America/Argentina/Mendoza + America/Argentina/San_Luis + America/Argentina/Rio_Gallegos + America/Argentina/Ushuaia + + + + + Pacific/Pago_Pago + + + + + Europe/Vienna + + + + + + Australia/Sydney + Australia/Melbourne + Australia/Brisbane + Australia/Hobart + Australia/Currie + Australia/Lindeman + + + Antarctica/Macquarie + + + Australia/Lord_Howe + + + Australia/Adelaide + Australia/Broken_Hill + Australia/Darwin + + + Australia/Perth + + + Australia/Eucla + + + + + America/Aruba + + + + + Europe/Mariehamn + + + + + Asia/Baku + + + + + Europe/Sarajevo + + + + + America/Barbados + + + + + Asia/Dhaka + + + + + Europe/Brussels + + + + + Africa/Ouagadougou + + + + + Europe/Sofia + + + + + Asia/Bahrain + + + + + Africa/Bujumbura + + + + + Africa/Porto-Novo + + + + + America/St_Barthelemy + + + + + Atlantic/Bermuda + + + + + Asia/Brunei + + + + + America/La_Paz + + + + + America/Kralendijk + + + + + + America/Noronha + + + America/Sao_Paulo + America/Belem + America/Fortaleza + America/Recife + America/Araguaina + America/Maceio + America/Bahia + America/Santarem + + + America/Manaus + America/Campo_Grande + America/Cuiaba + America/Porto_Velho + America/Boa_Vista + + + America/Eirunepe + America/Rio_Branco + + + + + America/Nassau + + + + + Asia/Thimphu + + + + + Africa/Gaborone + + + + + Europe/Minsk + + + + + America/Belize + + + + + + America/St_Johns + + + America/Halifax + America/Glace_Bay + America/Moncton + America/Goose_Bay + America/Blanc-Sablon + + + America/Toronto + America/Nipigon + America/Thunder_Bay + America/Iqaluit + America/Pangnirtung + America/Atikokan + + + America/Winnipeg + America/Regina + America/Rankin_Inlet + America/Rainy_River + America/Swift_Current + America/Resolute + + + America/Edmonton + America/Cambridge_Bay + America/Yellowknife + America/Inuvik + America/Dawson_Creek + America/Creston + America/Fort_Nelson + + + America/Vancouver + America/Whitehorse + America/Dawson + + + + + Indian/Cocos + + + + + + Africa/Lubumbashi + + + Africa/Kinshasa + + + + + Africa/Bangui + + + + + Africa/Brazzaville + + + + + Europe/Zurich + + + + + Africa/Abidjan + + + + + Pacific/Rarotonga + + + + + + America/Punta_Arenas + + + America/Santiago + + + Pacific/Easter + + + + + Africa/Douala + + + + + + Asia/Shanghai + + + Asia/Urumqi + + + + + America/Bogota + + + + + America/Costa_Rica + + + + + America/Havana + + + + + Atlantic/Cape_Verde + + + + + America/Curacao + + + + + Indian/Christmas + + + + + + Asia/Nicosia + + + Asia/Famagusta + + + + + Europe/Prague + + + + + Europe/Berlin + Europe/Busingen + + + + + Africa/Djibouti + + + + + Europe/Copenhagen + + + + + America/Dominica + + + + + America/Santo_Domingo + + + + + Africa/Algiers + + + + + + America/Guayaquil + + + Pacific/Galapagos + + + + + Europe/Tallinn + + + + + Africa/Cairo + + + + + Africa/El_Aaiun + + + + + Africa/Asmara + + + + + + Europe/Madrid + Africa/Ceuta + + + Atlantic/Canary + + + + + Africa/Addis_Ababa + + + + + Europe/Helsinki + + + + + Pacific/Fiji + + + + + Atlantic/Stanley + + + + + + Pacific/Pohnpei + Pacific/Kosrae + + + Pacific/Chuuk + + + + + Atlantic/Faroe + + + + + Europe/Paris + + + + + Africa/Libreville + + + + + Europe/London + + + + + America/Grenada + + + + + Asia/Tbilisi + + + + + America/Cayenne + + + + + Europe/Guernsey + + + + + Africa/Accra + + + + + Europe/Gibraltar + + + + + + America/Danmarkshavn + + + America/Scoresbysund + + + America/Godthab + + + America/Thule + + + + + Africa/Banjul + + + + + Africa/Conakry + + + + + America/Guadeloupe + + + + + Africa/Malabo + + + + + Europe/Athens + + + + + Atlantic/South_Georgia + + + + + America/Guatemala + + + + + Pacific/Guam + + + + + Africa/Bissau + + + + + America/Guyana + + + + + Asia/Hong_Kong + + + + + America/Tegucigalpa + + + + + Europe/Zagreb + + + + + America/Port-au-Prince + + + + + Europe/Budapest + + + + + + Asia/Jayapura + + + Asia/Makassar + + + Asia/Jakarta + Asia/Pontianak + + + + + Europe/Dublin + + + + + Asia/Jerusalem + + + + + Europe/Isle_of_Man + + + + + Asia/Kolkata + + + + + Indian/Chagos + + + + + Asia/Baghdad + + + + + Asia/Tehran + + + + + Atlantic/Reykjavik + + + + + Europe/Rome + + + + + Europe/Jersey + + + + + America/Jamaica + + + + + Asia/Amman + + + + + Asia/Tokyo + + + + + Africa/Nairobi + + + + + Asia/Bishkek + + + + + Asia/Phnom_Penh + + + + + + Pacific/Kiritimati + + + Pacific/Enderbury + + + Pacific/Tarawa + + + + + Indian/Comoro + + + + + America/St_Kitts + + + + + Asia/Pyongyang + + + + + Asia/Seoul + + + + + Asia/Kuwait + + + + + America/Cayman + + + + + + Asia/Almaty + Asia/Qyzylorda + + + Asia/Aqtau + Asia/Oral + Asia/Aqtobe + Asia/Atyrau + + + + + Asia/Vientiane + + + + + Asia/Beirut + + + + + America/St_Lucia + + + + + Europe/Vaduz + + + + + Asia/Colombo + + + + + Africa/Monrovia + + + + + Africa/Maseru + + + + + Europe/Vilnius + + + + + Europe/Luxembourg + + + + + Europe/Riga + + + + + Africa/Tripoli + + + + + Africa/Casablanca + + + + + Europe/Monaco + + + + + Europe/Chisinau + + + + + Europe/Podgorica + + + + + America/Marigot + + + + + Indian/Antananarivo + + + + + Pacific/Majuro + Pacific/Kwajalein + + + + + Europe/Skopje + + + + + Africa/Bamako + + + + + Asia/Yangon + + + + + + Asia/Choibalsan + Asia/Ulaanbaatar + + + Asia/Hovd + + + + + Asia/Macau + + + + + Pacific/Saipan + + + + + America/Martinique + + + + + Africa/Nouakchott + + + + + America/Montserrat + + + + + Europe/Malta + + + + + Indian/Mauritius + + + + + Indian/Maldives + + + + + Africa/Blantyre + + + + + + America/Mexico_City + America/Merida + America/Monterrey + America/Matamoros + America/Bahia_Banderas + + + America/Cancun + + + America/Chihuahua + America/Hermosillo + America/Mazatlan + America/Ojinaga + + + America/Tijuana + + + + + Asia/Kuala_Lumpur + Asia/Kuching + + + + + Africa/Maputo + + + + + Africa/Windhoek + + + + + Pacific/Noumea + + + + + Africa/Niamey + + + + + Pacific/Norfolk + + + + + Africa/Lagos + + + + + America/Managua + + + + + Europe/Amsterdam + + + + + Europe/Oslo + + + + + Asia/Kathmandu + + + + + Pacific/Nauru + + + + + Pacific/Niue + + + + + + Pacific/Auckland + + + Pacific/Chatham + + + + + Asia/Muscat + + + + + America/Panama + + + + + America/Lima + + + + + + Pacific/Gambier + + + Pacific/Marquesas + + + Pacific/Tahiti + + + + + + Pacific/Port_Moresby + + + Pacific/Bougainville + + + + + Asia/Manila + + + + + Asia/Karachi + + + + + Europe/Warsaw + + + + + America/Miquelon + + + + + Pacific/Pitcairn + + + + + America/Puerto_Rico + + + + + Asia/Gaza + Asia/Hebron + + + + + + Europe/Lisbon + Atlantic/Madeira + + + Atlantic/Azores + + + + + Pacific/Palau + + + + + America/Asuncion + + + + + Asia/Qatar + + + + + Indian/Reunion + + + + + Europe/Bucharest + + + + + Europe/Belgrade + + + + + + Asia/Kamchatka + Asia/Anadyr + + + Asia/Magadan + Asia/Sakhalin + Asia/Srednekolymsk + + + Asia/Vladivostok + Asia/Ust-Nera + + + Asia/Yakutsk + Asia/Chita + Asia/Khandyga + + + Asia/Irkutsk + + + Asia/Krasnoyarsk + Asia/Novosibirsk + Asia/Barnaul + Asia/Novokuznetsk + Asia/Tomsk + + + Asia/Omsk + + + Asia/Yekaterinburg + + + Europe/Samara + Europe/Astrakhan + Europe/Ulyanovsk + Europe/Saratov + + + Europe/Moscow + Europe/Volgograd + Europe/Kirov + Europe/Simferopol + + + Europe/Kaliningrad + + + + + Africa/Kigali + + + + + Asia/Riyadh + + + + + Pacific/Guadalcanal + + + + + Indian/Mahe + + + + + Africa/Khartoum + + + + + Europe/Stockholm + + + + + Asia/Singapore + + + + + Atlantic/St_Helena + + + + + Europe/Ljubljana + + + + + Arctic/Longyearbyen + + + + + Europe/Bratislava + + + + + Africa/Freetown + + + + + Europe/San_Marino + + + + + Africa/Dakar + + + + + Africa/Mogadishu + + + + + America/Paramaribo + + + + + Africa/Juba + + + + + Africa/Sao_Tome + + + + + America/El_Salvador + + + + + America/Lower_Princes + + + + + Asia/Damascus + + + + + Africa/Mbabane + + + + + America/Grand_Turk + + + + + Africa/Ndjamena + + + + + + Indian/Kerguelen + + + + + Africa/Lome + + + + + Asia/Bangkok + + + + + Asia/Dushanbe + + + + + Pacific/Fakaofo + + + + + Asia/Dili + + + + + Asia/Ashgabat + + + + + Africa/Tunis + + + + + Pacific/Tongatapu + + + + + Europe/Istanbul + + + + + America/Port_of_Spain + + + + + Pacific/Funafuti + + + + + Asia/Taipei + + + + + Africa/Dar_es_Salaam + + + + + Europe/Kiev + Europe/Uzhgorod + Europe/Zaporozhye + + + + + Africa/Kampala + + + + + + Pacific/Wake + + + Pacific/Midway + + + + + + America/New_York + America/Detroit + America/Kentucky/Louisville + America/Kentucky/Monticello + America/Indiana/Indianapolis + America/Indiana/Vincennes + America/Indiana/Winamac + America/Indiana/Marengo + America/Indiana/Petersburg + America/Indiana/Vevay + + + America/Chicago + America/Indiana/Knox + America/Menominee + America/North_Dakota/Center + America/North_Dakota/New_Salem + America/Indiana/Tell_City + America/North_Dakota/Beulah + + + America/Denver + America/Boise + America/Phoenix + + + America/Los_Angeles + + + America/Anchorage + America/Juneau + America/Yakutat + America/Nome + America/Metlakatla + America/Sitka + + + Pacific/Honolulu + America/Adak + + + + + America/Montevideo + + + + + Asia/Tashkent + Asia/Samarkand + + + + + Europe/Vatican + + + + + America/St_Vincent + + + + + America/Caracas + + + + + America/Tortola + + + + + America/St_Thomas + + + + + Asia/Ho_Chi_Minh + + + + + Pacific/Efate + + + + + Pacific/Wallis + + + + + Pacific/Apia + + + + + Asia/Aden + + + + + Indian/Mayotte + + + + + Africa/Johannesburg + + + + + Africa/Lusaka + + + + + Africa/Harare + + +