diff options
| author | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:31:59 +0000 |
|---|---|---|
| committer | victorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 01:31:59 +0000 |
| commit | 1f9daa69aef67b05cf46c56a1e34588a5a5e2ba0 (patch) | |
| tree | 60c28a487db3fb6f118006d247c4386b1401b93b /build | |
| parent | 7f8abea4d5728b1b94fe38702a0021e2e4a82abb (diff) | |
| download | chromium_src-1f9daa69aef67b05cf46c56a1e34588a5a5e2ba0.zip chromium_src-1f9daa69aef67b05cf46c56a1e34588a5a5e2ba0.tar.gz chromium_src-1f9daa69aef67b05cf46c56a1e34588a5a5e2ba0.tar.bz2 | |
Build googleurl as dll for multi dll build.
R=brettw
TEST=none
BUG=46311
Review URL: http://codereview.chromium.org/2896011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 20da6ab..20eb15a 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -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', + }], ], }, ], |