am 84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."

* commit '84f0c7c258b3a72eed8737662bb5a730d6d9f5e2':
  update-tzdata.py needs to know where to find icu.
This commit is contained in:
Elliott Hughes 2014-07-10 00:16:25 +00:00 committed by Android Git Automerger
commit feccec68c5

View File

@ -31,8 +31,8 @@ CheckDirExists(bionic_libc_tools_zoneinfo_dir, 'bionic/libc/tools/zoneinfo')
print 'Found bionic in %s ...' % bionic_dir
# Find the icu4c directory.
icu_dir = os.path.realpath('%s/../external/icu4c' % bionic_dir)
CheckDirExists(icu_dir, 'external/icu4c')
icu_dir = os.path.realpath('%s/../external/icu/icu4c/source' % bionic_dir)
CheckDirExists(icu_dir, 'external/icu/icu4c/source')
print 'Found icu in %s ...' % icu_dir