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

Attempt to fix all.gyp again, take #2. 

The prior fix -- #317907 -- used "iOS" instead of "ios".

The initial change disabled the "blink_tests" target, and also had a redundant conditions block.

My first attempt at a fix fixed blink_tests, but typo'ed "iOS" instead of "ios", causing the iOS bots to pick up stuff that couldn't build, and fail.

TBR=brettw@chromium.org
NOTRY=true
NOTREECHECKS=true

Review URL: https://codereview.chromium.org/953803004

Cr-Original-Commit-Position: refs/heads/master@{#317914}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2f69645f3a92b8386435a17b13ff3b9e52bf01c8
This commit is contained in:
Dirk Pranke 2015-02-24 15:18:58 -08:00
Родитель 1a9dfebeb5
Коммит f075d13bc6
1 изменённых файлов: 48 добавлений и 52 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -467,10 +467,56 @@
}, # target_name: chromium_builder_tests
],
'conditions': [
# TODO(GYP) - make gyp_all and gn_all work on iOS and Android also.
['OS!="ios"', {
'targets': [
{
'target_name': 'blink_tests',
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell_apk',
'../breakpad/breakpad.gyp:dump_syms#host',
'../breakpad/breakpad.gyp:minidump_stackwalk#host',
],
}, { # OS!="android"
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell',
],
}],
['OS=="win"', {
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
'../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS!="win" and OS!="android"', {
'dependencies': [
'../breakpad/breakpad.gyp:minidump_stackwalk',
],
}],
['OS=="mac"', {
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms#host',
'../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS=="linux"', {
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms',
],
}],
],
}, # target_name: blink_tests
],
}], # OS!=ios
['OS!="ios" and OS!="android"', {
'targets': [
{
# TODO(GYP) - make gyp_all and gn_all work on iOS and Android also.
'target_name': 'gyp_all',
'type': 'none',
'dependencies': [
@ -620,57 +666,7 @@
}],
],
},
]},
], # OS!="ios" and OS!="android"
['OS!="iOS"', {
'targets': [
{
'target_name': 'blink_tests',
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
],
'conditions': [
['OS=="android"', {
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell_apk',
'../breakpad/breakpad.gyp:dump_syms#host',
'../breakpad/breakpad.gyp:minidump_stackwalk#host',
],
}, { # OS!="android"
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell',
],
}],
['OS=="win"', {
'dependencies': [
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
'../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS!="win" and OS!="android"', {
'dependencies': [
'../breakpad/breakpad.gyp:minidump_stackwalk',
],
}],
['OS=="mac"', {
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms#host',
'../content/content_shell_and_tests.gyp:layout_test_helper',
],
}],
['OS=="linux"', {
'dependencies': [
'../breakpad/breakpad.gyp:dump_syms',
],
}],
],
}, # target_name: blink_tests
],
}], # OS!=ios
['OS!="ios" and OS!="android"', {
'targets': [
{
]},{
'target_name': 'chromium_builder_nacl_win_integration',
'type': 'none',
'dependencies': [