From 541c2253206785c7b225252403f6f54723231317 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 26 Jul 2012 16:19:46 -0700 Subject: [PATCH] Remove the 'Factory' time zone by not processing the 'factory' file. The factory file (and Factory time zone) was meant as a way to say "not configured" that would give a clear error when running date(1). For us it would just look like UTC, so it is of no value. Bug: 2997381 Change-Id: I1a4b85dce97d1d9370b22ba79e8fe5dafff56541 --- libc/tools/zoneinfo/generate | 2 +- libc/zoneinfo/zoneinfo.dat | Bin 484347 -> 484092 bytes libc/zoneinfo/zoneinfo.idx | Bin 29900 -> 29848 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/tools/zoneinfo/generate b/libc/tools/zoneinfo/generate index 2059abd15..ab2617ff9 100755 --- a/libc/tools/zoneinfo/generate +++ b/libc/tools/zoneinfo/generate @@ -24,7 +24,7 @@ if not os.path.isdir(bionic_libc_tools_zoneinfo_dir) or not os.path.isdir(bionic print 'Found bionic in %s...' % bionic_dir -regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'factory', 'northamerica', 'southamerica'] +regions = ['africa', 'antarctica', 'asia', 'australasia', 'backward', 'etcetera', 'europe', 'northamerica', 'southamerica'] def current_tzdata_version(): diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index 77992559511236a29a2f475df3159b08795aeccc..82d6b9c510c889762b5cc1ea491eca49ee3c8640 100644 GIT binary patch delta 27 jcmex;T=vgV*@hOz7N!>F7M2#)Eo_RYi delta 208 zcmex!RQC6A*@hOz7N!>F7M2#)Eo_R<%?%mAz$ZUBF-M^!GdESCDnBn(A-A-+L?J0v zp*XcfSGPD7D4Ln9keirS3RG2)n4UU)Vl1m(E}5EvHgegJYNOrsi^;5d)1#iV@od+7 I&UUUE01}}_W&i*H diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx index 507ae7a389db68630c35dd31a27900e90c574a1c..2268706a3e8c1a86bc26be3a06f7a33b0c93f0c2 100644 GIT binary patch delta 512 zcmXBQO-R#m7zgnG9;U4{3EaWMh*0dJkp2h}9AtCmbhG9gy%@Q*xqMAYgAxxODncZz zub_yChYmtQgTHu44?+_KMLI<6;9R5?)W$;Sm>mcHHMH_7iqIQ^5d(~X#4Nx}>3Qzgj^ zxD3WINOrFyZ15d%^2djq0Qm2ZBvqy-0%DSy2=;=Z%c-cQSxU5$)KG0h zqjA=(r5|PCeXEkAH&|-jluN4^2`RBwV>vV_+5jFuQ*yBvqlCQ(VegpO3Q*Wa7U3he zb}>e7f5RGayu%5pC`M7c66Z?gSNzt)!t8>^ZLCBz}7v8=gBuE~DqNJRf&Sq(AmDR%L+|pXkk6jpeQG{S% z(E5jnBy@iR>uW(2UP$$S>f)T=#h=4DXEJZi=B<>^>#{RS zZP@zzL9c2+d(rxYQ=A_4{#a4e6b!{A`qp zO04tPd|FFc3<1LIDq)r-b~P3a8Eom%QkTamQvV3oNy8|fkj5G;k-c%$^lE9c&~3yJVWDVYsjy