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

Issue 2896011: Build googleurl as dll for multi dll build. (Closed)

Created:
10 years, 5 months ago by Victor Wang
Modified:
9 years, 7 months ago
Reviewers:
brettw
CC:
chromium-reviews
Visibility:
Public.

Description

Build googleurl as dll for multi dll build. R=brettw TEST=none BUG=46311 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=52260

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+18 lines, -2 lines) Patch
M build/temp_gyp/googleurl.gyp View 3 chunks +18 lines, -2 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Victor Wang
10 years, 5 months ago (2010-07-13 03:13:20 UTC) #1
brettw
10 years, 5 months ago (2010-07-13 05:44:40 UTC) #2
LGTM

On Mon, Jul 12, 2010 at 8:13 PM,  <victorw@chromium.org> wrote:
> Reviewers: brettw,
>
> Description:
> Build googleurl as dll for multi dll build.
>
> R=brettw
> TEST=none
> BUG=46311
>
>
> Please review this at http://codereview.chromium.org/2896011/show
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
>  M     build/temp_gyp/googleurl.gyp
>
>
> 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',
> +        }],
>       ],
>     },
>   ],
>
>
>

Powered by Google App Engine
This is Rietveld 408576698