diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:45:48 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:45:48 +0000 |
| commit | 7394c6dfcd1d490dc4ca753bbab2443ac6517282 (patch) | |
| tree | 4f585d0cc81df0fe030dab062dc9e742c1f6af4f /url/url.gyp | |
| parent | 15b05a7d37381e8487fb7eebf2d90355a8774431 (diff) | |
| download | chromium_src-7394c6dfcd1d490dc4ca753bbab2443ac6517282.zip chromium_src-7394c6dfcd1d490dc4ca753bbab2443ac6517282.tar.gz chromium_src-7394c6dfcd1d490dc4ca753bbab2443ac6517282.tar.bz2 | |
Revert 203025 "Make the copy of GURL in src/url buildable as a c..."
> Make the copy of GURL in src/url buildable as a component build. (try 2)
>
> BUG=229660
> TBR=brettw
>
> Review URL: https://chromiumcodereview.appspot.com/15805003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/15848009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'url/url.gyp')
| -rw-r--r-- | url/url.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/url/url.gyp b/url/url.gyp index 5066899..0434669 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -8,11 +8,8 @@ }, 'targets': [ { - # Note, this target_name cannot be 'url', because that will generate - # 'url.dll' for a Windows component build, and that will confuse Windows, - # which has a system DLL with the same name. - 'target_name': 'url_lib', - 'type': '<(component)', + 'target_name': 'url', + 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', '../third_party/icu/icu.gyp:icudata', @@ -55,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, ], @@ -68,7 +65,7 @@ '../base/base.gyp:run_all_unittests', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icuuc', - 'url_lib', + 'url', ], 'sources': [ 'gurl_unittest.cc', @@ -77,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"', { |