diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-06 15:23:11 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-08-06 17:31:48 -0700 |
| commit | 13bab43337242094663d6f699ad996ddc99ec582 (patch) | |
| tree | d6d1c009d71464edc399a0a4c74c08a4998cab43 /libc/tools/zoneinfo/update-tzdata.py | |
| parent | 3a238ae7620298608e1d463901051c397e4f8a2f (diff) | |
| download | bionic-13bab43337242094663d6f699ad996ddc99ec582.zip bionic-13bab43337242094663d6f699ad996ddc99ec582.tar.gz bionic-13bab43337242094663d6f699ad996ddc99ec582.tar.bz2 | |
Fix the tzdata update tools.
The recent libcore ZoneInfo changes mean that we can no longer
compile libcore's ZoneInfo against the RI. Luckily, the field in
our data file that we needed ZoneInfo for isn't actually used.
This change removes our dependence on libcore.
I've left the field in to avoid a file format change. We can remove
the field if/when we next have a real need to bump the file format.
(cherry-pick of 90cb5ffb85a9bc2e725824b3ca8db932d02c45db.)
Bug: 16168653
Change-Id: Iedad2252c2b49f4d8bb2c7d9078b39b622444ca7
Diffstat (limited to 'libc/tools/zoneinfo/update-tzdata.py')
| -rwxr-xr-x | libc/tools/zoneinfo/update-tzdata.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libc/tools/zoneinfo/update-tzdata.py b/libc/tools/zoneinfo/update-tzdata.py index 6b69a5a..e800e8f 100755 --- a/libc/tools/zoneinfo/update-tzdata.py +++ b/libc/tools/zoneinfo/update-tzdata.py @@ -115,7 +115,7 @@ def BuildIcuToolsAndData(data_filename): print 'Configuring ICU tools...' subprocess.check_call(['%s/runConfigureICU' % icu_dir, 'Linux']) print 'Making ICU tools...' - subprocess.check_call(['make', '-j6']) + subprocess.check_call(['make', '-j32']) # Run the ICU tools. os.chdir('tools/tzcode') @@ -169,11 +169,8 @@ def BuildBionicToolsAndData(data_filename): WriteSetupFile() print 'Calling ZoneCompactor to update bionic to %s...' % new_version - libcore_src_dir = '%s/../libcore/luni/src/main/java/' % bionic_dir subprocess.check_call(['javac', '-d', '.', - '%s/ZoneCompactor.java' % bionic_libc_tools_zoneinfo_dir, - '%s/libcore/util/ZoneInfo.java' % libcore_src_dir, - '%s/libcore/io/BufferIterator.java' % libcore_src_dir]) + '%s/ZoneCompactor.java' % bionic_libc_tools_zoneinfo_dir]) subprocess.check_call(['java', 'ZoneCompactor', 'setup', 'data', 'extracted/zone.tab', bionic_libc_zoneinfo_dir, new_version]) |