diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 14:29:56 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-17 14:29:56 +0000 |
| commit | f3e54807f915c5594262547a4214412911c497c4 (patch) | |
| tree | c68ec73961f3bfab2552f40a892ab836998100dc /build/temp_gyp/googleurl.gyp | |
| parent | afcc5df0e6b04039ceda63d97ae2e9bf361ca6d4 (diff) | |
| download | chromium_src-f3e54807f915c5594262547a4214412911c497c4.zip chromium_src-f3e54807f915c5594262547a4214412911c497c4.tar.gz chromium_src-f3e54807f915c5594262547a4214412911c497c4.tar.bz2 | |
Revert 75188 - Revert 75184 - Move googleurl's unittest to use a custom main so ICU can be started up in
a way that matches the Chromium build.
Review URL: http://codereview.chromium.org/6532003
TBR=thomasvl@chromium.org
Review URL: http://codereview.chromium.org/6507022
TBR=rsesek@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp/googleurl.gyp')
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 9a2eda3..d4f3a37 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -69,6 +69,7 @@ { 'target_name': 'googleurl_unittests', 'dependencies': [ + '../../base/base.gyp:base_i18n', 'googleurl', '../../testing/gtest.gyp:gtest', '../../third_party/icu/icu.gyp:icuuc', @@ -79,7 +80,7 @@ '../../googleurl/src/url_parse_unittest.cc', '../../googleurl/src/url_test_utils.h', '../../googleurl/src/url_util_unittest.cc', - '../../googleurl/src/gurl_test_main.cc', + 'googleurl_test_main.cc', ], 'conditions': [ ['OS=="linux" or OS=="freebsd"', { |