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

Unified Diff: base/base.gyp

Issue 99473012: Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add icu{uc,i18n} dependency to base_unittests Created 7 years 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 | « no previous file | base/i18n/icu_util.cc » ('j') | base/i18n/icu_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 0c8207f84c32e7cec29a1ed4a34483c0ed2d9349..442ca30119fc5ce2ae9bcaa8bf4742a6fcc06ad7 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -701,8 +701,8 @@
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
- '../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
Mark Mentovai 2013/12/17 22:12:02 Why are you moving this? Seems like a no-op change
jungshik at Google 2013/12/18 20:59:11 Sorry to get you 'alarmed'. That's just an acciden
+ '../third_party/icu/icu.gyp:icui18n',
],
'includes': ['../build/nocompile.gypi'],
'variables': {
@@ -797,8 +797,12 @@
['OS == "win"', {
# This is needed to trigger the dll copy step on windows.
Mark Mentovai 2013/12/17 22:12:02 Move the comment into the condition it applies to.
jungshik at Google 2013/12/18 20:59:11 Done.
# TODO(mark): This should not be necessary.
- 'dependencies': [
- '../third_party/icu/icu.gyp:icudata',
+ 'conditions': [
+ ['icu_use_data_file_flag==0', {
+ 'dependencies': [
+ '../third_party/icu/icu.gyp:icudata',
+ ],
+ }],
],
'sources!': [
'file_descriptor_shuffle_unittest.cc',
« no previous file with comments | « no previous file | base/i18n/icu_util.cc » ('j') | base/i18n/icu_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698