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

Issue 926113004: Move stubdata.c from icudata to icuuc (Closed)

Created:
5 years, 10 months ago by jungshik at Google
Modified:
5 years, 10 months ago
Reviewers:
Mark Mentovai, scottmg
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/deps/icu.git@master
Target Ref:
refs/heads/master
Visibility:
Public.

Description

Move stubdata.c from icudata to icuuc This is to fix a linker error when linking icuuc.dll; ICU_DATA_ENTRY (icudt54_dat) symbol is not found on Windows clean build from the scratch (component=shared_library). Move stubdata.c to icuuc target from icudata target. Also, make U_DATA_API (used for U_ICU_DATA_ENTRYPOINT in common/udata.cpp) to be U_EXPORT instead of U_IMPORT when icu_use_data_file_flag = 1 or on Windows. On Windows, using the icudt.dll (i.e. icu_use_data_file_flag=0) also requires this change. BUG=428145 TEST=All trybots can build a target that requires ICU. R=mark@chromium.org, scottmg@chromium.org Committed: https://chromium.googlesource.com/chromium/deps/icu/+/d158fece3ebecaef3a68a8a98f3cec6672ffd11e

Patch Set 1 #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+27 lines, -3 lines) Patch
M README.chromium View 1 chunk +3 lines, -0 lines 0 comments Download
M icu.gyp View 2 chunks +4 lines, -3 lines 1 comment Download
A patches/data_symb.patch View 1 chunk +16 lines, -0 lines 0 comments Download
M source/common/unicode/utypes.h View 1 chunk +4 lines, -0 lines 0 comments Download

Messages

Total messages: 13 (1 generated)
jungshik at Google
The error in question from some (NOT all) windows bots is : FAILED: E:\b\depot_tools\python276_bin\python.exe gyp-win-tool ...
5 years, 10 months ago (2015-02-13 21:31:43 UTC) #1
jungshik at Google
Scott and Mark, can you take a look? I was able to reproduce this issue ...
5 years, 10 months ago (2015-02-13 23:38:54 UTC) #3
Mark Mentovai
LGTM
5 years, 10 months ago (2015-02-13 23:45:22 UTC) #4
scottmg
It seems like only Android Webview doesn't use the data file now? Could we remove ...
5 years, 10 months ago (2015-02-13 23:46:32 UTC) #5
Mark Mentovai
Pretty sure the gn build description is in the Chrome repository, while the gyp one ...
5 years, 10 months ago (2015-02-13 23:48:09 UTC) #6
jungshik at Google
On 2015/02/13 23:48:09, Mark Mentovai wrote: > Pretty sure the gn build description is in ...
5 years, 10 months ago (2015-02-13 23:52:31 UTC) #7
jungshik at Google
On 2015/02/13 23:46:32, scottmg wrote: > It seems like only Android Webview doesn't use the ...
5 years, 10 months ago (2015-02-13 23:58:26 UTC) #8
scottmg
OK, thanks. lgtm.
5 years, 10 months ago (2015-02-14 00:01:56 UTC) #9
jungshik at Google
On 2015/02/13 23:52:31, Jungshik at google wrote: > On 2015/02/13 23:48:09, Mark Mentovai wrote: > ...
5 years, 10 months ago (2015-02-14 00:02:10 UTC) #10
scottmg
On 2015/02/13 23:58:26, Jungshik at google wrote: > On 2015/02/13 23:46:32, scottmg wrote: > > ...
5 years, 10 months ago (2015-02-14 00:02:28 UTC) #11
jungshik at Google
Committed patchset #1 (id:1) manually as d158fece3ebecaef3a68a8a98f3cec6672ffd11e (presubmit successful).
5 years, 10 months ago (2015-02-14 00:28:24 UTC) #12
jungshik at Google
5 years, 10 months ago (2015-02-14 15:16:56 UTC) #13
Message was sent while issue was closed.
https://codereview.chromium.org/926113004/diff/1/icu.gyp
File icu.gyp (right):

https://codereview.chromium.org/926113004/diff/1/icu.gyp#newcode138
icu.gyp:138: 'sources/': [['exclude', 'icudtl_dat']],
To prevent libicudata.a or its Win-equivalent (that will not be generated any
more) from being looked for by a linker, I'll make another CL to add 'type:
none' to this section. Somehow it was not a problem in my local tests
(Win,Mac/Linux) nor in most trybots (except for one ios bot).

Powered by Google App Engine
This is Rietveld 408576698