Adding reference to experimental browser distribution files.

Adding reference to experimental browser distribution files.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=26036

[kuchhal, 2009-09-11 21:04:16]

lgtm.

On Fri, Sep 11, 2009 at 1:29 PM, <robertshield@chromium.org> wrote:

> Reviewers: kuchhal,
>
> Description:
> Adding reference to experimental browser distribution files.
>
>
> Please review this at http://codereview.chromium.org/192076
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     build/common.gypi
>  M     chrome/installer/installer.gyp
>
>
> Index: chrome/installer/installer.gyp
> ===================================================================
> --- chrome/installer/installer.gyp      (revision 25950)
> +++ chrome/installer/installer.gyp      (working copy)
> @@ -31,10 +31,6 @@
>           'include_dirs': [
>             '../..',
>           ],
> -          'variables': {
> -            'extra_installer_util_sources%': [
> -            ],
> -          },
>           'sources': [
>             'util/browser_distribution.cc',
>             'util/browser_distribution.h',
> @@ -88,8 +84,19 @@
>             'util/work_item_list.h',
>             '../common/json_value_serializer.cc',
>             '../common/pref_names.cc',
> -            '<@(extra_installer_util_sources)',
>           ],
> +          'variables': {
> +            'extra_installer_util_sources%': 0,
> +          },
> +          'conditions': [
> +            ['extra_installer_util_sources', {
> +                'sources': [
> +                  'util/exp/experimental_browser_distribution.cc',
> +                  'util/exp/experimental_browser_distribution.h',
> +                ],
> +              },
> +            ],
> +          ],
>         },
>         {
>           'target_name': 'gcapi_dll',
> Index: build/common.gypi
> ===================================================================
> --- build/common.gypi   (revision 25950)
> +++ build/common.gypi   (working copy)
> @@ -69,13 +69,13 @@
>     # {'variables': {'library': 'shared_library'}}
>     # to compile as shared by default
>     'library%': 'static_library',
> -
> +
>     # The Google Update appid.
>     'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
> -
> -    # Extra defines to add to built targets
> -    'extra_custom_defines%': [],
>
> +    # Whether to add the experimental build define.
> +    'experimental_build_define%': 0,
> +
>     # TODO(bradnelson): eliminate this when possible.
>     # To allow local gyp files to prevent release.vsprops from being
> included.
>     # Yes(1) means include release.vsprops.
> @@ -172,15 +172,15 @@
>       'mac_release_optimization%': '3', # Use -O3 unless overridden
>       'mac_debug_optimization%': '0'    # Use -O0 unless overridden
>     },
> -    'defines': [
> -      '<@(extra_custom_defines)',
> -    ],
>     'conditions': [
>       ['branding=="Chrome"', {
>         'defines': ['GOOGLE_CHROME_BUILD'],
>       }, {  # else: branding!="Chrome"
>         'defines': ['CHROMIUM_BUILD'],
>       }],
> +      ['experimental_build_define', {
> +        'defines': ['CHROME_EXP_BUILD'],
> +      }],
>       ['toolkit_views==1', {
>         'defines': ['TOOLKIT_VIEWS=1'],
>       }],
>
>
>