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
This commit is contained in:
alexeypa@chromium.org 2012-04-12 09:50:12 +00:00
Родитель 58b52e73f9
Коммит d24df49612
2 изменённых файлов: 14 добавлений и 0 удалений

Просмотреть файл

@ -533,6 +533,12 @@
'../pdf/pdf.gyp:pdf', '../pdf/pdf.gyp:pdf',
], ],
}], # internal_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 ], # targets

Просмотреть файл

@ -302,6 +302,9 @@
# Force rlz to use chrome's networking stack. # Force rlz to use chrome's networking stack.
'force_rlz_use_chrome_net%': 1, 'force_rlz_use_chrome_net%': 1,
'platformsdk_path%': '<(DEPTH)/third_party/platformsdk_win7/files',
'wix_path%': '<(DEPTH)/third_party/wix',
'conditions': [ 'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and # the 'conditions' clause. Initial attempts resulted in chromium and
@ -523,6 +526,8 @@
'enable_automation%': '<(enable_automation)', 'enable_automation%': '<(enable_automation)',
'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)', 'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
'enable_task_manager%': '<(enable_task_manager)', 'enable_task_manager%': '<(enable_task_manager)',
'platformsdk_path%': '<(platformsdk_path)',
'wix_path%': '<(wix_path)',
# Use system yasm instead of bundled one. # Use system yasm instead of bundled one.
'use_system_yasm%': 0, 'use_system_yasm%': 0,
@ -751,6 +756,9 @@
# Native Client is enabled by default. # Native Client is enabled by default.
'disable_nacl%': 0, 'disable_nacl%': 0,
'platformsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py <(platformsdk_path))',
'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
'conditions': [ 'conditions': [
['os_posix==1 and OS!="mac" and OS!="android"', { ['os_posix==1 and OS!="mac" and OS!="android"', {
# This will set gcc_version to XY if you are running gcc X.Y.*. # This will set gcc_version to XY if you are running gcc X.Y.*.