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

Unified Diff: build/temp_gyp/googleurl.gyp

Issue 2896011: Build googleurl as dll for multi dll build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/temp_gyp/googleurl.gyp
===================================================================
--- build/temp_gyp/googleurl.gyp (revision 51864)
+++ build/temp_gyp/googleurl.gyp (working copy)
@@ -10,7 +10,7 @@
'targets': [
{
'target_name': 'googleurl',
- 'type': '<(library)',
+ 'type': '<(component)',
'msvs_guid': 'EF5E94AB-B646-4E5B-A058-52EF07B8351C',
'dependencies': [
'../../base/base.gyp:base',
@@ -52,10 +52,17 @@
'../..',
],
},
+ 'conditions': [
+ ['OS=="win" and component=="shared_library"', {
+ 'defines': [
+ 'GURL_DLL',
+ 'GURL_IMPLEMENTATION',
+ ],
+ }],
+ ],
},
{
'target_name': 'googleurl_unittests',
- 'type': 'executable',
'dependencies': [
'googleurl',
'../../testing/gtest.gyp:gtest',
@@ -79,6 +86,15 @@
}],
],
}],
+ # TODO(victorw): The unittest code uses inline functions that access
+ # global variables, it also uses internal functions that we may not want
+ # to export, so skip building unittests for windows multi dll build.
+ # The googleurl functions are tested by the static library build.
+ ['OS=="win" and component=="shared_library"', {
+ 'type': 'none',
+ }, {
+ 'type': 'executable',
+ }],
],
},
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698