diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 23:54:43 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 23:54:43 +0000 |
| commit | 1c84350dde8a870c4ea0825ba6cd9b087fc44e7e (patch) | |
| tree | 5d2b35f5ece3e4a80c24a7a1f3c682dbf8dcbb25 /remoting | |
| parent | cd0c2e8591262c2d66478db55440327beb708602 (diff) | |
| download | chromium_src-1c84350dde8a870c4ea0825ba6cd9b087fc44e7e.zip chromium_src-1c84350dde8a870c4ea0825ba6cd9b087fc44e7e.tar.gz chromium_src-1c84350dde8a870c4ea0825ba6cd9b087fc44e7e.tar.bz2 | |
Do not register a non official Host with Omaha installer to avoid autoupdating it to the latest official verion.
Review URL: http://codereview.chromium.org/10114001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/installer/chromoting.wxs | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/remoting/host/installer/chromoting.wxs b/remoting/host/installer/chromoting.wxs index 8766586..7cc0ce3 100644 --- a/remoting/host/installer/chromoting.wxs +++ b/remoting/host/installer/chromoting.wxs @@ -141,21 +141,23 @@ Scope="any" /> </Component> - <Component Id="omaha_registration" - Guid="9a14673d-9518-4cf3-b737-52f09f02a10b"> - <RegistryKey Id="omaha_client_key" - Root="HKLM" - Key="SOFTWARE\Google\Update\Clients\$(var.OmahaAppid)" - Action="create"> - <RegistryValue Type="string" - Name="pv" - Value="$(var.Version)"/> - - <RegistryValue Type="string" - Name="name" - Value="$(var.ChromotingHost)"/> - </RegistryKey> - </Component> + <?ifdef OfficialBuild ?> + <Component Id="omaha_registration" + Guid="9a14673d-9518-4cf3-b737-52f09f02a10b"> + <RegistryKey Id="omaha_client_key" + Root="HKLM" + Key="SOFTWARE\Google\Update\Clients\$(var.OmahaAppid)" + Action="create"> + <RegistryValue Type="string" + Name="pv" + Value="$(var.Version)"/> + + <RegistryValue Type="string" + Name="name" + Value="$(var.ChromotingHost)"/> + </RegistryKey> + </Component> + <?endif?> <Component Id="service_controller" Guid="a559f5ba-4b11-4a6e-a1e9-70d9166cb8fc"> @@ -319,7 +321,9 @@ <UIRef Id="WixUI_ErrorProgressText" /> <Feature Id="chromoting_host" Level="1" Title="$(var.ChromotingHost)"> - <ComponentRef Id="omaha_registration"/> + <?ifdef OfficialBuild ?> + <ComponentRef Id="omaha_registration"/> + <?endif?> <ComponentRef Id="remoting_host"/> <ComponentRef Id="sas.dll"/> <ComponentRef Id="service_controller"/> |