diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 11:25:48 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 11:25:48 +0000 |
| commit | c22822797b06ed158a1e8db7b8282e6d54a245b7 (patch) | |
| tree | bb1b5c111e20f30a14b97f9a822a3a693a7eec6c /url/url.gyp | |
| parent | 4a3ddef359865759009e9576fb6c970bebb39f5f (diff) | |
| download | chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.zip chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.tar.gz chromium_src-c22822797b06ed158a1e8db7b8282e6d54a245b7.tar.bz2 | |
Revert 201723 "Make the copy of GURL in src/url buildable as a c..."
Speculative revert:
url_unittests url_unittests crashed or hung
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%281%29/builds/36158
> Make the copy of GURL in src/url buildable as a component build.
>
> BUG=229660
>
> Review URL: https://chromiumcodereview.appspot.com/15255009
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/15859003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url.gyp')
| -rw-r--r-- | url/url.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/url/url.gyp b/url/url.gyp index d9b5807eb..0434669 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -9,7 +9,7 @@ 'targets': [ { 'target_name': 'url', - 'type': '<(component)', + 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', '../third_party/icu/icu.gyp:icudata', @@ -52,7 +52,7 @@ ], }, 'defines': [ - 'URL_IMPLEMENTATION', + 'FULL_FILESYSTEM_URL_SUPPORT=1', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], @@ -74,6 +74,9 @@ 'url_test_utils.h', 'url_util_unittest.cc', ], + 'defines': [ + 'FULL_FILESYSTEM_URL_SUPPORT=1', + ], 'conditions': [ ['os_posix==1 and OS!="mac" and OS!="ios"', { |