diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 00:25:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-09 00:25:09 +0000 |
| commit | 20594d790d50e8ec3c15d8771ae9fa41828c95dc (patch) | |
| tree | 793a2b8800a3b16b9f49807ad70934fcd911cccc /build/temp_gyp/googleurl.gyp | |
| parent | fdf1d4e627af0433629be1c2c11e85f878618224 (diff) | |
| download | chromium_src-20594d790d50e8ec3c15d8771ae9fa41828c95dc.zip chromium_src-20594d790d50e8ec3c15d8771ae9fa41828c95dc.tar.gz chromium_src-20594d790d50e8ec3c15d8771ae9fa41828c95dc.tar.bz2 | |
Revert 109138 (broke linux shared build) - GURL: Build the unit tests on the components build.
BUG=102738
TEST=none
Review URL: http://codereview.chromium.org/8496034
TBR=rvargas@chromium.org
Review URL: http://codereview.chromium.org/8495036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/temp_gyp/googleurl.gyp')
| -rw-r--r-- | build/temp_gyp/googleurl.gyp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build/temp_gyp/googleurl.gyp b/build/temp_gyp/googleurl.gyp index 8d61551..3ed3eb7 100644 --- a/build/temp_gyp/googleurl.gyp +++ b/build/temp_gyp/googleurl.gyp @@ -67,7 +67,6 @@ }, { 'target_name': 'googleurl_unittests', - 'type': 'executable', 'dependencies': [ 'googleurl', '../../base/base.gyp:base_i18n', @@ -95,6 +94,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 component builds. + # The googleurl functions are tested by the static library build. + ['component=="shared_library"', { + 'type': 'none', + }, { + 'type': 'executable', + }], ], }, ], |