From d24df496120b9dad10adc588ea0c694664012b7b Mon Sep 17 00:00:00 2001 From: "alexeypa@chromium.org" Date: Thu, 12 Apr 2012 09:50:12 +0000 Subject: [PATCH] The Chrome Remote Desktop installation for Windows can be build by bots now. Review URL: http://codereview.chromium.org/10031014 git-svn-id: http://src.chromium.org/svn/trunk/src/build@131960 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- all.gyp | 6 ++++++ common.gypi | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/all.gyp b/all.gyp index ef6c0e5f1..e97e0abc6 100644 --- a/all.gyp +++ b/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/common.gypi b/common.gypi index 9dec996c5..1c17edd18 100644 --- a/common.gypi +++ b/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': '