Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(563)

Unified Diff: url/url.gyp

Issue 15805003: Make the copy of GURL in src/url buildable as a component build. (try 2) (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more class level exports Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/gurl.h ('k') | url/url_canon.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/url.gyp
===================================================================
--- url/url.gyp (revision 202256)
+++ url/url.gyp (working copy)
@@ -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"',
{
« no previous file with comments | « url/gurl.h ('k') | url/url_canon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698