diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:39:57 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 00:39:57 +0000 |
| commit | 2dcec1fbb4343693721ec1b81452a93883efbc2e (patch) | |
| tree | f32021cc84b1f14e46e90a978c201b536cdde61e /url/url.gyp | |
| parent | 1ada567356f93581d6615f5e4d06f8c5e32e1cef (diff) | |
| download | chromium_src-2dcec1fbb4343693721ec1b81452a93883efbc2e.zip chromium_src-2dcec1fbb4343693721ec1b81452a93883efbc2e.tar.gz chromium_src-2dcec1fbb4343693721ec1b81452a93883efbc2e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203025 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 0434669..5066899 100644 --- a/url/url.gyp +++ b/url/url.gyp @@ -8,8 +8,11 @@ }, 'targets': [ { - 'target_name': 'url', - 'type': 'static_library', + # 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)', 'dependencies': [ '../base/base.gyp:base', '../third_party/icu/icu.gyp:icudata', @@ -52,7 +55,7 @@ ], }, 'defines': [ - 'FULL_FILESYSTEM_URL_SUPPORT=1', + 'URL_IMPLEMENTATION', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], @@ -65,7 +68,7 @@ '../base/base.gyp:run_all_unittests', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icuuc', - 'url', + 'url_lib', ], 'sources': [ 'gurl_unittest.cc', @@ -74,9 +77,6 @@ 'url_test_utils.h', 'url_util_unittest.cc', ], - 'defines': [ - 'FULL_FILESYSTEM_URL_SUPPORT=1', - ], 'conditions': [ ['os_posix==1 and OS!="mac" and OS!="ios"', { |