diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:49:55 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:49:55 +0000 |
| commit | 5ecf7cb2894d80ad8dea0cc608b526929a15de2f (patch) | |
| tree | dd5080e05c8486263906848f705b86269da9f106 /net/net.gyp | |
| parent | b1a64b4db3cc5b4c6066ebcfbe44238b584782ce (diff) | |
| download | chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.zip chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.tar.gz chromium_src-5ecf7cb2894d80ad8dea0cc608b526929a15de2f.tar.bz2 | |
Make it possible to build cronet without icu.
BUG=362608
Review URL: https://codereview.chromium.org/274183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index a454e7d..054d066 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -439,8 +439,15 @@ }, ], [ 'use_icu_alternatives_on_android == 1', { + 'dependencies!': [ + '../base/base.gyp:base_i18n', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', + ], 'sources!': [ + 'base/filename_util_icu.cc', 'base/net_string_util_icu.cc', + 'base/net_util_icu.cc', ], 'sources': [ 'base/net_string_util_icu_alternatives_android.cc', @@ -641,7 +648,10 @@ ], }, ], - [ 'use_v8_in_net==1', { + # Always need use_v8_in_net to be 1 to run gyp on Android, so just + # remove net_unittest's dependency on v8 when using icu alternatives + # instead of setting use_v8_in_net to 0. + [ 'use_v8_in_net==1 and use_icu_alternatives_on_android==0', { 'dependencies': [ 'net_with_v8', ], @@ -749,10 +759,22 @@ }, ], ['OS == "android" and gtest_target_type == "shared_library"', { + # TODO(mmenke): This depends on test_support_base, which depends on + # icu. Figure out a way to remove that dependency. 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', ] }], + [ 'use_icu_alternatives_on_android == 1', { + 'dependencies!': [ + '../base/base.gyp:base_i18n', + ], + 'sources!': [ + 'base/filename_util_unittest.cc', + 'base/net_util_icu_unittest.cc', + ], + }, + ], ], 'target_conditions': [ # These source files are excluded by default platform rules, but they @@ -823,6 +845,8 @@ ], 'export_dependent_settings': [ '../base/base.gyp:base', + # TODO(mmenke): This depends on icu, figure out a way to build tests + # without icu. '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', '../testing/gmock.gyp:gmock', |