diff options
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 5 | ||||
| -rw-r--r-- | chrome/installer/util/browser_distribution.cc | 8 |
3 files changed, 18 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 3d6f1ea..11800f4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -72,6 +72,9 @@ # The Google Update appid. 'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}', + + # Extra defines to add to built targets + 'extra_custom_defines%': [], # TODO(bradnelson): eliminate this when possible. # To allow local gyp files to prevent release.vsprops from being included. @@ -169,6 +172,9 @@ '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'], diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 915d0cf..be5dc87 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -31,6 +31,10 @@ 'include_dirs': [ '../..', ], + 'variables': { + 'extra_installer_util_sources%': [ + ], + }, 'sources': [ 'util/browser_distribution.cc', 'util/browser_distribution.h', @@ -84,6 +88,7 @@ 'util/work_item_list.h', '../common/json_value_serializer.cc', '../common/pref_names.cc', + '<@(extra_installer_util_sources)', ], }, { diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc index 25555ac..19b5937 100644 --- a/chrome/installer/util/browser_distribution.cc +++ b/chrome/installer/util/browser_distribution.cc @@ -12,10 +12,16 @@ #include "base/registry.h" #include "chrome/installer/util/google_chrome_distribution.h" +#if defined(CHROME_EXP_BUILD) +#include "chrome/installer/util/exp/experimental_browser_distribution.h" +#endif + BrowserDistribution* BrowserDistribution::GetDistribution() { static BrowserDistribution* dist = NULL; if (dist == NULL) { -#if defined(GOOGLE_CHROME_BUILD) +#if defined(CHROME_EXP_BUILD) + dist = new ExperimentalBrowserDistribution(); +#elif defined(GOOGLE_CHROME_BUILD) dist = new GoogleChromeDistribution(); #else dist = new BrowserDistribution(); |