mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert 186522 

> Build src/remoting/remoting.gyp:remoting_host_installation on the main waterfall.
> 
> remoting_host_installation uses lots of non-trivial GYP that tend to break because of differences between ninja and msbuild. Building it on the main waterfall gives us an early warning if something goes wrong.
> 
> BUG=180600
> 
> Review URL: https://codereview.chromium.org/12543006

TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/12545010

git-svn-id: http://src.chromium.org/svn/trunk/src/build@186526 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
miu@chromium.org 2013-03-06 23:08:13 +00:00
Родитель 9dabb39f64
Коммит dee065e514
1 изменённых файлов: 19 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

47
all.gyp
Просмотреть файл

@ -248,34 +248,25 @@
'../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/views/views.gyp:views_unittests',
'../webkit/webkit.gyp:test_shell_common',
],
'conditions': [
['target_arch!="x64"', {
'dependencies': [
'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
]
}, { # target_arch!="x64"
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
}], # target_arch=="x64"
# remoting_host_installation uses lots of non-trivial GYP that tend
# to break because of differences between ninja and msbuild. Make
# sure this target is built by the builders on the main waterfall.
# See http://crbug.com/180600.
['wix_exists == "True" and sas_dll_exists == "True"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_host_installation',
],
}],
],
],
'conditions': [
['target_arch!="x64"', {
'dependencies': [
'../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
'../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
]
}, { # target_arch!="x64"
'dependencies!': [
'../chrome_frame/chrome_frame.gyp:npchrome_frame',
],
'defines': [
'OMIT_CHROME_FRAME',
],
}], # target_arch=="x64"
],
}],
['OS=="linux"', {
'dependencies': [