diff options
| author | claireho <chinglanho@gmail.com> | 2012-02-28 13:37:54 -0800 |
|---|---|---|
| committer | claireho <chinglanho@gmail.com> | 2012-02-28 13:44:19 -0800 |
| commit | 50e1caec409ecc3792508ed012fcbbdf1130d452 (patch) | |
| tree | 7f7dd63295ef0a1323a45b2a8624cb980504bc5d /stubdata | |
| parent | 0c557cf365b873106993a381b7f20be0fb738cf9 (diff) | |
| download | icu4c-50e1caec409ecc3792508ed012fcbbdf1130d452.tar.gz | |
Move ICU prebuilt packages from linux-x86/icu-4.8 to linux-x86_64/icu-4.8.
Bug 6083904: Prebuilt ICU package is placed in wrong directory.
Changed the stubdata readme.txt and icu_dat_generator.py for new ICU package directory.
Change-Id: Iaf34777579a0536d7242726f33be767e1e08c1b2
Diffstat (limited to 'stubdata')
| -rwxr-xr-x | stubdata/icu_dat_generator.py | 4 | ||||
| -rw-r--r-- | stubdata/readme.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/stubdata/icu_dat_generator.py b/stubdata/icu_dat_generator.py index 295f964b..3ccb1d5a 100755 --- a/stubdata/icu_dat_generator.py +++ b/stubdata/icu_dat_generator.py @@ -259,8 +259,8 @@ def main(): # Work out the ICU version from the input filenames, so we can find the # appropriate pre-built ICU tools. icu_version = re.sub(r"([^0-9])", "", os.path.basename(input_files[0])) - ICU_PREBUILT_DIR = os.path.join(os.environ.get("ANDROID_EABI_TOOLCHAIN"), - "..", "..", "..", "icu-%s.%s" % (icu_version[0], icu_version[1])) + ICU_PREBUILT_DIR = os.path.join(os.environ.get("ANDROID_BUILD_TOP"), + "prebuilt", "linux-x86_64", "icu-%s.%s" % (icu_version[0], icu_version[1])) if not os.path.exists(ICU_PREBUILT_DIR): print "%s does not exist!" % ICU_PREBUILT_DIR diff --git a/stubdata/readme.txt b/stubdata/readme.txt index 452ba3d3..0fd761d7 100644 --- a/stubdata/readme.txt +++ b/stubdata/readme.txt @@ -63,7 +63,7 @@ Locale Resource Files: cd $ANDROID_BUILD_TOP/external/icu4c/stubdata cp icudt 48l-all.dat icudt 48l.dat mkdir tempDir - $ANDROID_BUILD_TOP/prebuilt/linux-x86/icu-4.8/icupkg icudt 48l.dat -x "*" -d tempDir + $ANDROID_BUILD_TOP/prebuilt/linux-x86_64/icu-4.8/icupkg icudt 48l.dat -x "*" -d tempDir Run ICU tests: ICU tests are not part of Android build. If you change the ICU code or data, |