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

Unified Diff: icu.gyp

Issue 926113004: Move stubdata.c from icudata to icuuc (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « README.chromium ('k') | patches/data_symb.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: icu.gyp
diff --git a/icu.gyp b/icu.gyp
index 54af0e416f23a8da2bbcd620665f4e682dd117d5..3677f9b4d3e3ef7049c170403ec79c89b9618843 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -136,8 +136,6 @@
[ 'icu_use_data_file_flag==1', {
# Remove any assembly data file.
'sources/': [['exclude', 'icudtl_dat']],
jungshik at Google 2015/02/14 15:16:56 To prevent libicudata.a or its Win-equivalent (tha
- # Compile in the stub data symbol.
- 'sources': ['source/stubdata/stubdata.c'],
# Make sure any binary depending on this gets the data file.
'conditions': [
@@ -325,10 +323,13 @@
[ 'use_system_icu==0 and want_separate_host_toolset==0', {
'toolsets': ['target'],
}],
- [ 'OS == "win" and icu_use_data_file_flag==0', {
+ [ 'OS == "win" or icu_use_data_file_flag==1', {
'sources': [
'source/stubdata/stubdata.c',
],
+ 'defines': [
+ 'U_ICUDATAENTRY_IN_COMMON',
+ ],
}],
[ 'OS == "win" and clang==1', {
# Note: General clang warnings should go in the
« no previous file with comments | « README.chromium ('k') | patches/data_symb.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698