Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Issue 89863002: Move the logic for getting icu data out of icu_util (Closed)

Created:
7 years ago by jungshik at Google
Modified:
7 years ago
CC:
chromium-reviews, erikwright+watch_chromium.org, jshin+watch_chromium.org, TVL
Visibility:
Public.

Description

Move the logic for getting icu data out of icu_util Currently, how to build/link the icu data is split between common.gypi and icu_util.cc Move it out of icu_util.cc and put it in common.gypi Also, remove icudata from the dependency list in url.gyp. icuuc depends on icudata and specifying icuuc alone is sufficient. Otherwise, ninja complains about multiple rules specified for icudata and a circular dependency when icu_use_data_file_flag is set to 1 on Linux. A similar change has to be made in third_party/WebKit/Source/web/web.gyp. (see https://codereview.chromium.org/93053003/ ) This CL does not change the actual build process, yet. It's just to prepare to switch to "icu*.dat" on Mac and Linux. BUG=72633 TEST=All the configuration/builds go fine on all platforms. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238567

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : rebased #

Patch Set 4 : add icu_use_data_flag to windows #

Patch Set 5 : move icu_use_data_file_flag out of platform conditions #

Patch Set 6 : drop icudata from url.gyp #

Total comments: 4

Patch Set 7 : addressed review comments #

Patch Set 8 : set the flag to 0 by default #

Total comments: 4
Unified diffs Side-by-side diffs Delta from patch set Stats (+27 lines, -30 lines) Patch
M base/i18n/icu_util.cc View 1 2 3 4 5 6 4 chunks +12 lines, -29 lines 4 comments Download
M build/common.gypi View 1 2 3 4 5 6 7 2 chunks +15 lines, -0 lines 0 comments Download
M url/url.gyp View 1 2 3 4 5 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 14 (0 generated)
jungshik at Google
This is just a prep for an actual fix. Setting icu_use_data_file_flag to 1 on Linux ...
7 years ago (2013-11-27 23:50:59 UTC) #1
jungshik at Google
On 2013/11/27 23:50:59, Jungshik Shin wrote: > This is just a prep for an actual ...
7 years ago (2013-11-28 01:33:12 UTC) #2
TVL
Handing off to Mark. I've been away from this too long to safely speak on ...
7 years ago (2013-12-02 14:15:55 UTC) #3
Mark Mentovai
LGTM otherwise https://codereview.chromium.org/89863002/diff/100001/base/i18n/icu_util.cc File base/i18n/icu_util.cc (right): https://codereview.chromium.org/89863002/diff/100001/base/i18n/icu_util.cc#newcode102 base/i18n/icu_util.cc:102: if (data_path.empty()) { This check can stay ...
7 years ago (2013-12-02 17:24:53 UTC) #4
jungshik at Google
Thank you, Mark, for the review. I took care of your comments except for '_flag'. ...
7 years ago (2013-12-02 18:36:53 UTC) #5
Mark Mentovai
Oh, that’s right. OK, LGTM as-is, then.
7 years ago (2013-12-02 18:48:38 UTC) #6
jungshik at Google
Thanks, Mark. Adding abarth for the owner's review of url.gyp
7 years ago (2013-12-02 18:58:25 UTC) #7
abarth-chromium
url.gyp <--- LGTM
7 years ago (2013-12-02 20:19:09 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jshin@chromium.org/89863002/140001
7 years ago (2013-12-03 19:25:23 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jshin@chromium.org/89863002/140001
7 years ago (2013-12-03 23:43:02 UTC) #10
commit-bot: I haz the power
Change committed as 238567
7 years ago (2013-12-04 04:37:08 UTC) #11
Jiang Jiang
https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc File base/i18n/icu_util.cc (right): https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc#newcode89 base/i18n/icu_util.cc:89: // Assume it is in the framework bundle's Resources ...
7 years ago (2013-12-04 10:43:35 UTC) #12
Jiang Jiang
https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc File base/i18n/icu_util.cc (right): https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc#newcode100 base/i18n/icu_util.cc:100: base::mac::PathForFrameworkBundleResource(CFSTR(ICU_UTIL_DATA_FILE_NAME)); Wrong indent by the way. I also wonder ...
7 years ago (2013-12-04 10:45:41 UTC) #13
jungshik at Google
7 years ago (2013-12-09 05:54:46 UTC) #14
Message was sent while issue was closed.
https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc
File base/i18n/icu_util.cc (right):

https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc#ne...
base/i18n/icu_util.cc:89: // Assume it is in the framework bundle's Resources
directory.
On 2013/12/04 10:43:35, Jiang wrote:
> This comment should be moved down to close to that
> base::mac::PathForFrameworkBundleResource() call.

Good catch. thanks.

https://codereview.chromium.org/89863002/diff/140001/base/i18n/icu_util.cc#ne...
base/i18n/icu_util.cc:100:
base::mac::PathForFrameworkBundleResource(CFSTR(ICU_UTIL_DATA_FILE_NAME));
On 2013/12/04 10:45:42, Jiang wrote:
> Wrong indent by the way.
> 
> I also wonder how it can work out for non-bundled executables such as test
> cases. Do Chromium always set the override framework bundle path for test
cases
> such as base_unittests?

Thank you for the comment. 
I don't know the answer. I'm not familiar with the way Mac executables are
built. Let's figure out a way to work in all cases in bug 72633.

Powered by Google App Engine
This is Rietveld 408576698