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

Get gn_all/gyp_remaining working for Windows. 

This change doesn't actually cause anything new to be built, but it makes 'gn_all' and 'gyp_remaining' exist as targets on a windows build, and explicitly lists all of the targets built on win that weren't listed before.

A number of these targets should actually build in a GN build, but I will take care of that in a follow-up CL.

R=brettw@chromium.org
BUG=354261
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg

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

Cr-Original-Commit-Position: refs/heads/master@{#324285}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: eaef8f504d6e2a55626e2fb8b6c233f1d756d65c
This commit is contained in:
dpranke 2015-04-08 14:16:03 -07:00 коммит произвёл Commit bot
Родитель cfba7d9980
Коммит e42babed67
2 изменённых файлов: 175 добавлений и 66 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -492,7 +492,7 @@
],
'conditions': [
# TODO(GYP): make gn_migration.gypi work unconditionally.
['OS=="linux" and target_arch=="x64" and chromeos==0 and chromecast==0 and disable_nacl==0', {
['OS=="win" or (OS=="linux" and target_arch=="x64" and chromeos==0 and chromecast==0 and disable_nacl==0)', {
'includes': [
'gn_migration.gypi',
],

239
gn_migration.gypi
Просмотреть файл

@ -40,11 +40,6 @@
'../base/base.gyp:build_utf8_validator_tables#host',
'../base/base.gyp:check_example',
'../base/base.gyp:protect_file_posix',
'../breakpad/breakpad.gyp:core-2-minidump',
'../breakpad/breakpad.gyp:microdump_stackwalk',
'../breakpad/breakpad.gyp:minidump_dump',
'../breakpad/breakpad.gyp:minidump_stackwalk',
'../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
'../cc/cc_tests.gyp:cc_perftests',
'../cc/cc_tests.gyp:cc_unittests',
'../cc/blink/cc_blink_tests.gyp:cc_blink_unittests',
@ -84,7 +79,6 @@
'../crypto/crypto.gyp:crypto_unittests',
'../extensions/extensions_tests.gyp:extensions_browsertests',
'../extensions/extensions_tests.gyp:extensions_unittests',
'../dbus/dbus.gyp:dbus_test_server',
'../device/device_tests.gyp:device_unittests',
'../gin/gin.gyp:gin_v8_snapshot_fingerprint',
'../gin/gin.gyp:gin_shell',
@ -110,7 +104,6 @@
'../media/cast/cast.gyp:cast_unittests',
'../media/cast/cast.gyp:generate_barcode_video',
'../media/cast/cast.gyp:generate_timecode_audio',
'../media/cast/cast.gyp:tap_proxy',
'../mojo/mojo.gyp:mojo',
'../mojo/mojo_base.gyp:mojo_application_chromium',
'../mojo/mojo_base.gyp:mojo_common_unittests',
@ -162,7 +155,7 @@
'../ppapi/ppapi_internal.gyp:ppapi_example_video_decode_dev',
'../ppapi/ppapi_internal.gyp:ppapi_example_video_effects',
'../ppapi/ppapi_internal.gyp:ppapi_example_video_encode',
'../ppapi/ppapi_internal.gyp:ppapi_tests', # TODO(GYP): Split out the examples and tests
'../ppapi/ppapi_internal.gyp:ppapi_tests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
'../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma',
'../printing/printing.gyp:printing_unittests',
@ -191,7 +184,6 @@
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
'../third_party/pdfium/samples/samples.gyp:pdfium_test',
'../third_party/smhasher/smhasher.gyp:pmurhash',
'../third_party/sqlite/sqlite.gyp:sqlite_shell',
'../tools/gn/gn.gyp:gn',
'../tools/gn/gn.gyp:generate_test_gn_data',
'../tools/gn/gn.gyp:gn_unittests',
@ -220,9 +212,9 @@
'../components/components.gyp:session_manager_component',
]
}],
['disable_nacl==0 and disable_nacl_untrusted==0', {
['clang==1', {
'dependencies': [
'../remoting/remoting.gyp:remoting_key_tester',
'../build/sanitizers/sanitizers.gyp:llvm-symbolizer',
],
}],
['disable_nacl==0 and disable_nacl_untrusted==0', {
@ -238,6 +230,10 @@
}],
['OS!="win"', {
'dependencies': [
'../breakpad/breakpad.gyp:core-2-minidump',
'../breakpad/breakpad.gyp:microdump_stackwalk',
'../breakpad/breakpad.gyp:minidump_dump',
'../breakpad/breakpad.gyp:minidump_stackwalk',
'../breakpad/breakpad.gyp:symupload',
],
}],
@ -253,6 +249,11 @@
'../remoting/remoting.gyp:remoting_unittests',
],
}],
['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../remoting/remoting.gyp:remoting_key_tester',
],
}],
['use_x11==1', {
'dependencies': [
'../media/media.gyp:player_x11',
@ -384,6 +385,7 @@
'../sandbox/sandbox.gyp:chrome_sandbox',
'../sandbox/sandbox.gyp:sandbox_linux_unittests',
'../sandbox/sandbox.gyp:sandbox_linux_jni_unittests',
'../third_party/sqlite/sqlite.gyp:sqlite_shell',
],
}],
['OS=="mac"', {
@ -441,12 +443,8 @@
}],
['OS=="win"', {
'dependencies': [
"//ui/metro_viewer",
'../third_party/codesighs/codesighs.gyp:msdump2symdb',
],
'dependencies!': [
"//crypto:crypto_unittests", # TODO(GYP)
"//net:net_unittests", # TODO(GYP)
'../win8/win8.gyp:metro_viewer',
],
}, {
'dependencies': [
@ -479,62 +477,173 @@
'target_name': 'gyp_remaining',
'type': 'none',
'conditions': [
['remoting==1', {
'dependencies': [
'../remoting/app_remoting_webapp.gyp:ar_sample_app', # crbug.com/471916
],
}],
['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../remoting/remoting.gyp:remoting_key_tester',
],
}],
['test_isolation_mode!="noop"', {
'dependencies': [
'../base/base.gyp:base_unittests_run',
'../cc/cc_tests.gyp:cc_unittests_run',
'../chrome/chrome.gyp:browser_tests_run',
'../chrome/chrome.gyp:chrome_run',
'../chrome/chrome.gyp:interactive_ui_tests_run',
'../chrome/chrome.gyp:sync_integration_tests_run',
'../chrome/chrome.gyp:unit_tests_run',
'../components/components_tests.gyp:components_browsertests_run',
'../components/components_tests.gyp:components_unittests_run',
'../content/content_shell_and_tests.gyp:content_browsertests_run',
'../content/content_shell_and_tests.gyp:content_unittests_run',
'../crypto/crypto.gyp:crypto_unittests_run',
'../courgette/courgette.gyp:courgette_unittests_run',
'../gpu/gpu.gyp:gpu_unittests_run',
'../media/cast/cast.gyp:cast_unittests_run',
'../media/media.gyp:media_unittests_run',
'../net/net.gyp:net_unittests_run',
'../sql/sql.gyp:sql_unittests_run',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
'../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
'../ui/app_list/app_list.gyp:app_list_unittests_run',
'../ui/events/events.gyp:events_unittests_run',
'../ui/message_center/message_center.gyp:message_center_unittests_run',
'../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_run',
],
'conditions': [
['use_ash==1', {
'dependencies': [
'../ash/ash.gyp:ash_unittests_run',
],
}],
['OS=="linux"', {
'dependencies': [
'../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
],
}],
],
}],
['use_openssl==1', {
'dependencies': [
'../third_party/boringssl/boringssl_tests.gyp:boringssl_ecdsa_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_bn_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_pqueue_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_digest_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_cipher_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_hkdf_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_constant_time_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_thread_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_base64_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_gcm_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_bytestring_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_evp_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_dsa_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_rsa_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_hmac_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_aead_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_ssl_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_err_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_lhash_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_pbkdf_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_dh_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_pkcs12_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_example_mul',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_ec_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_bio_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_pkcs7_test',
'../third_party/boringssl/boringssl_tests.gyp:boringssl_unittests',
],
}],
['OS=="linux"', {
'dependencies': [
'../third_party/webrtc/tools/tools.gyp:frame_analyzer',
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
],
'conditions': [
['remoting==1', {
'dependencies': [
'../remoting/app_remoting_webapp.gyp:ar_sample_app', # crbug.com/471916
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
'dependencies': [
'../remoting/remoting.gyp:remoting_key_tester',
]
}],
],
}],
['test_isolation_mode!="noop"', {
'dependencies': [
'../base/base.gyp:base_unittests_run',
'../cc/cc_tests.gyp:cc_unittests_run',
'../chrome/chrome.gyp:browser_tests_run',
'../chrome/chrome.gyp:chrome_run',
'../chrome/chrome.gyp:interactive_ui_tests_run',
'../chrome/chrome.gyp:sync_integration_tests_run',
'../chrome/chrome.gyp:unit_tests_run',
'../components/components_tests.gyp:components_browsertests_run',
'../components/components_tests.gyp:components_unittests_run',
'../content/content_shell_and_tests.gyp:content_browsertests_run',
'../content/content_shell_and_tests.gyp:content_unittests_run',
'../crypto/crypto.gyp:crypto_unittests_run',
'../courgette/courgette.gyp:courgette_unittests_run',
'../gpu/gpu.gyp:gpu_unittests_run',
'../media/cast/cast.gyp:cast_unittests_run',
'../media/media.gyp:media_unittests_run',
'../net/net.gyp:net_unittests_run',
'../sandbox/sandbox.gyp:sandbox_linux_unittests_run',
'../sql/sql.gyp:sql_unittests_run',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests_run',
'../ui/accessibility/accessibility.gyp:accessibility_unittests_run',
'../ui/app_list/app_list.gyp:app_list_unittests_run',
'../ui/events/events.gyp:events_unittests_run',
'../ui/message_center/message_center.gyp:message_center_unittests_run',
'../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests_run',
],
'conditions': [
['use_ash==1', {
'dependencies': [
'../ash/ash.gyp:ash_unittests_run',
],
}],
],
}],
}],
['OS=="win"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator_unittests',
'../base/base.gyp:debug_message',
'../base/base.gyp:pe_image_test',
'../chrome/chrome.gyp:app_installer',
'../chrome/chrome.gyp:app_installer_unittests',
'../chrome/chrome.gyp:app_shim',
'../chrome/chrome.gyp:crash_service',
'../chrome/chrome.gyp:gcapi_dll',
'../chrome/chrome.gyp:gcapi_test',
'../chrome/chrome.gyp:installer_util_unittests',
'../chrome/chrome.gyp:pack_policy_templates',
'../chrome/chrome.gyp:sb_sigutil',
'../chrome/chrome.gyp:setup',
'../chrome/chrome.gyp:setup_unittests',
'../chrome/installer/mini_installer.gyp:mini_installer',
'../chrome/tools/crash_service/caps/caps.gyp:caps',
'../chrome_elf/chrome_elf.gyp:blacklist_test_dll_2',
'../chrome_elf/chrome_elf.gyp:blacklist_test_dll_3',
'../chrome_elf/chrome_elf.gyp:blacklist_test_main_dll',
'../chrome_elf/chrome_elf.gyp:chrome_elf_unittests',
'../chrome_elf/chrome_elf.gyp:dll_hash_main',
'../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device',
'../cloud_print/gcp20/prototype/gcp20_device.gyp:gcp20_device_unittests',
'../cloud_print/service/service.gyp:cloud_print_service',
'../cloud_print/service/service.gyp:cloud_print_service_config',
'../cloud_print/service/service.gyp:cloud_print_service_setup',
'../cloud_print/virtual_driver/win/install/virtual_driver_install.gyp:virtual_driver_setup',
'../cloud_print/virtual_driver/win/virtual_driver.gyp:gcp_portmon',
'../components/components.gyp:wifi_test',
'../content/content_shell_and_tests.gyp:content_shell_crash_service',
'../content/content_shell_and_tests.gyp:layout_test_helper',
'../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest',
'../gpu/gpu.gyp:angle_end2end_tests',
'../gpu/gpu.gyp:angle_perftests',
'../net/net.gyp:net_docs',
'../net/net.gyp:quic_client',
'../net/net.gyp:quic_server',
'../ppapi/ppapi_internal.gyp:ppapi_perftests',
'../remoting/app_remoting_test.gyp:ar_sample_test_driver',
'../remoting/remoting.gyp:remoting_breakpad_tester',
'../remoting/remoting.gyp:remoting_console',
'../remoting/remoting.gyp:remoting_desktop',
'../rlz/rlz.gyp:rlz',
'../rlz/rlz.gyp:rlz_id',
'../rlz/rlz.gyp:rlz_unittests',
'../sandbox/sandbox.gyp:pocdll',
'../sandbox/sandbox.gyp:sandbox_poc',
'../sandbox/sandbox.gyp:sbox_integration_tests',
'../sandbox/sandbox.gyp:sbox_unittests',
'../sandbox/sandbox.gyp:sbox_validation_tests',
'../testing/gtest.gyp:gtest_main',
'../third_party/codesighs/codesighs.gyp:msmap2tsv',
'../third_party/pdfium/samples/samples.gyp:pdfium_diff',
'../third_party/webrtc/tools/tools.gyp:frame_analyzer',
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
'../tools/win/static_initializers/static_initializers.gyp:static_initializers',
],
}],
['OS=="win" and target_arch=="ia32"', {
'dependencies': [
'../base/base.gyp:base_win64',
'../base/base.gyp:base_i18n_nacl_win64',
'../chrome/chrome.gyp:crash_service_win64',
'../chrome/chrome.gyp:launcher_support64',
'../components/components.gyp:breakpad_win64',
'../courgette/courgette.gyp:courgette64',
'../crypto/crypto.gyp:crypto_nacl_win64',
'../ipc/ipc.gyp:ipc_win64',
'../sandbox/sandbox.gyp:sandbox_win64',
'../cloud_print/virtual_driver/win/virtual_driver64.gyp:gcp_portmon64',
'../cloud_print/virtual_driver/win/virtual_driver64.gyp:virtual_driver_lib64',
],
}],
['OS=="win" and target_arch=="ia32" and configuration_policy==1', {
'dependencies': [
'../components/components.gyp:policy_win64',
]
}],
],
},
{