diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 09:50:12 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 09:50:12 +0000 |
| commit | 49ae3e55200b24617f7ae12752eaed1514fdaeb8 (patch) | |
| tree | 3678b858d7686deaccd8eec6fa0b7e7b30d83c66 /build | |
| parent | fc83cd3596faae66ce8159d60e6cdf8d554f1552 (diff) | |
| download | chromium_src-49ae3e55200b24617f7ae12752eaed1514fdaeb8.zip chromium_src-49ae3e55200b24617f7ae12752eaed1514fdaeb8.tar.gz chromium_src-49ae3e55200b24617f7ae12752eaed1514fdaeb8.tar.bz2 | |
The Chrome Remote Desktop installation for Windows can be build by bots now.
Review URL: http://codereview.chromium.org/10031014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | build/common.gypi | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index ef6c0e5..e97e0ab 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -533,6 +533,12 @@ '../pdf/pdf.gyp:pdf', ], }], # internal_pdf + ['component != "shared_library" and wix_exists == "True" and \ + platformsdk_exists == "True"', { + 'dependencies': [ + '../remoting/remoting.gyp:remoting_host_installation', + ], + }], # component != "shared_library" ] }, ], # targets diff --git a/build/common.gypi b/build/common.gypi index 9dec996..1c17edd 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -302,6 +302,9 @@ # Force rlz to use chrome's networking stack. 'force_rlz_use_chrome_net%': 1, + 'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files', + 'wix_path%': '<(DEPTH)/third_party/wix', + 'conditions': [ # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of # the 'conditions' clause. Initial attempts resulted in chromium and @@ -523,6 +526,8 @@ 'enable_automation%': '<(enable_automation)', 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 'enable_task_manager%': '<(enable_task_manager)', + 'platformsdk_path%': '<(platformsdk_path)', + 'wix_path%': '<(wix_path)', # Use system yasm instead of bundled one. 'use_system_yasm%': 0, @@ -751,6 +756,9 @@ # Native Client is enabled by default. 'disable_nacl%': 0, + 'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_path))', + 'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))', + 'conditions': [ ['os_posix==1 and OS!="mac" and OS!="android"', { # This will set gcc_version to XY if you are running gcc X.Y.*. |