diff options
Diffstat (limited to 'chromium/build/all.gyp')
| -rw-r--r-- | chromium/build/all.gyp | 439 |
1 files changed, 331 insertions, 108 deletions
diff --git a/chromium/build/all.gyp b/chromium/build/all.gyp index 0942a1c8c1d..7d212b455f7 100644 --- a/chromium/build/all.gyp +++ b/chromium/build/all.gyp @@ -3,6 +3,11 @@ # found in the LICENSE file. { + 'variables': { + # A hook that can be overridden in other repositories to add additional + # compilation targets to 'All'. Only used on Android. + 'android_app_targets%': [], + }, 'targets': [ { 'target_name': 'All', @@ -11,16 +16,13 @@ 'dependencies': [ 'some.gyp:*', '../base/base.gyp:*', - '../chrome/chrome.gyp:*', '../components/components.gyp:*', '../components/components_tests.gyp:*', '../content/content.gyp:*', - '../content/content_shell_and_tests.gyp:*', '../crypto/crypto.gyp:*', '../net/net.gyp:*', '../sdch/sdch.gyp:*', '../sql/sql.gyp:*', - '../sync/sync.gyp:*', '../testing/gmock.gyp:*', '../testing/gtest.gyp:*', '../third_party/icu/icu.gyp:*', @@ -28,13 +30,46 @@ '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../ui/accessibility/accessibility.gyp:*', + '../ui/base/ui_base.gyp:*', + '../ui/display/display.gyp:display_unittests', '../ui/snapshot/snapshot.gyp:*', - '../ui/ui.gyp:*', '../url/url.gyp:*', ], 'conditions': [ - ['OS!="ios"', { + ['OS=="ios"', { 'dependencies': [ + '../ios/ios.gyp:*', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', + '../ui/ui_unittests.gyp:ui_unittests', + ], + }], + ['OS=="android"', { + 'dependencies': [ + '../content/content_shell_and_tests.gyp:content_shell_apk', + '../mojo/mojo.gyp:mojo_shell_apk', + '../mojo/mojo.gyp:mojo_test_apk', + '<@(android_app_targets)', + 'android_builder_tests', + '../android_webview/android_webview.gyp:android_webview_apk', + '../chrome/chrome.gyp:chrome_shell_apk', + '../remoting/remoting.gyp:remoting_apk', + '../tools/telemetry/telemetry.gyp:*#host', + # TODO(nyquist) This should instead by a target for sync when all of + # the sync-related code for Android has been upstreamed. + # See http://crbug.com/159203 + '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', + ], + }, { + 'dependencies': [ + '../content/content_shell_and_tests.gyp:*', + # TODO: This should build on Android and the target should move to the list above. + '../sync/sync.gyp:*', + ], + }], + ['OS!="ios" and OS!="android"', { + 'dependencies': [ + '../third_party/re2/re2.gyp:re2', + '../chrome/chrome.gyp:*', '../cc/cc_tests.gyp:*', '../device/bluetooth/bluetooth.gyp:*', '../device/device_tests.gyp:*', @@ -49,8 +84,11 @@ '../mojo/mojo.gyp:*', '../ppapi/ppapi.gyp:*', '../ppapi/ppapi_internal.gyp:*', + '../ppapi/tools/ppapi_tools.gyp:*', '../printing/printing.gyp:*', '../skia/skia.gyp:*', + '../sync/tools/sync_tools.gyp:*', + '../third_party/WebKit/public/all.gyp:*', '../third_party/cacheinvalidation/cacheinvalidation.gyp:*', '../third_party/codesighs/codesighs.gyp:*', '../third_party/ffmpeg/ffmpeg.gyp:*', @@ -64,32 +102,21 @@ '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', '../third_party/ots/ots.gyp:*', + '../third_party/pdfium/samples/samples.gyp:*', '../third_party/qcms/qcms.gyp:*', - '../third_party/re2/re2.gyp:re2', - '../third_party/WebKit/public/all.gyp:*', '../tools/gn/gn.gyp:*', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', + '../tools/telemetry/telemetry.gyp:*', '../v8/tools/gyp/v8.gyp:*', - '../webkit/glue/webkit_glue.gyp:*', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:*', '<(libjpeg_gyp_path):*', ], - }, { # 'OS=="ios"' - 'dependencies': [ - '../ios/ios.gyp:*', - '../ui/ui_unittests.gyp:ui_unittests', - ], }], ['OS!="android" and OS!="ios"', { 'dependencies': [ '../chrome/tools/profile_reset/jtl_compiler.gyp:*', ], }], - ['os_posix==1 and OS!="android" and OS!="ios"', { - 'dependencies': [ - '../third_party/yasm/yasm.gyp:*#host', - ], - }], ['OS=="mac" or OS=="ios" or OS=="win"', { 'dependencies': [ '../third_party/nss/nss.gyp:*', @@ -102,6 +129,7 @@ }], ['OS=="mac"', { 'dependencies': [ + '../sandbox/sandbox.gyp:*', '../third_party/ocmock/ocmock.gyp:*', ], }], @@ -117,13 +145,6 @@ '../chrome/chrome.gyp:linux_packages_<(channel)', ], }], - ['chromeos==0', { - 'dependencies': [ - '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*', - '../third_party/libmtp/libmtp.gyp:*', - '../third_party/mtpd/mtpd.gyp:*', - ], - }], ['enable_ipc_fuzzer==1', { 'dependencies': [ '../tools/ipc_fuzzer/ipc_fuzzer.gyp:*', @@ -136,11 +157,6 @@ '../tools/xdisplaycheck/xdisplaycheck.gyp:*', ], }], - ['toolkit_uses_gtk==1', { - 'dependencies': [ - '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', - ], - }], ['OS=="win"', { 'conditions': [ ['win_use_allocator_shim==1', { @@ -148,13 +164,6 @@ '../base/allocator/allocator.gyp:*', ], }], - # Don't enable dependencies that don't work on Win64. - ['target_arch!="x64"', { - 'dependencies': [ - # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877 - '../tools/memory_watcher/memory_watcher.gyp:*', - ], - }], ], 'dependencies': [ '../chrome_elf/chrome_elf.gyp:*', @@ -164,6 +173,7 @@ '../sandbox/sandbox.gyp:*', '<(angle_path)/src/build_angle.gyp:*', '../third_party/bspatch/bspatch.gyp:*', + '../tools/win/static_initializers/static_initializers.gyp:*', ], }, { 'dependencies': [ @@ -179,7 +189,6 @@ ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:*', - '../ui/oak/oak.gyp:*', ], }], ['use_ash==1', { @@ -207,13 +216,24 @@ '../google_apis/gcm/gcm.gyp:*', ], }], + ['chromeos==1 or (OS=="linux" and use_aura==1)', { + 'dependencies': [ + '../apps/shell/app_shell.gyp:*', + ], + }], + ['chromeos==1', { + 'dependencies': [ + '../athena/main/athena_main.gyp:*', + ], + }], ], }, # target_name: All { 'target_name': 'All_syzygy', 'type': 'none', 'conditions': [ - ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { + ['OS=="win" and fastbuild==0 and target_arch=="ia32" and ' + '(syzyasan==1 or syzygy_optimize==1)', { 'dependencies': [ '../chrome/installer/mini_installer_syzygy.gyp:*', ], @@ -221,6 +241,8 @@ ], }, # target_name: All_syzygy { + # Note: Android uses android_builder_tests below. + # TODO: Consider merging that with this target. 'target_name': 'chromium_builder_tests', 'type': 'none', 'dependencies': [ @@ -230,18 +252,18 @@ '../net/net.gyp:net_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', + '../ui/display/display.gyp:display_unittests', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', ], 'conditions': [ - ['OS!="ios"', { + ['OS!="ios" and OS!="android"', { 'dependencies': [ '../cc/cc_tests.gyp:cc_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:chromedriver_tests', '../chrome/chrome.gyp:chromedriver_unittests', - # TODO(kkania): Remove these after infra no longer depends on them. - '../chrome/chrome.gyp:chromedriver2_unittests', '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:unit_tests', @@ -250,20 +272,24 @@ '../content/content_shell_and_tests.gyp:content_shell', '../content/content_shell_and_tests.gyp:content_unittests', '../device/device_tests.gyp:device_unittests', + '../extensions/extensions.gyp:extensions_unittests', '../gin/gin.gyp:gin_unittests', '../google_apis/google_apis.gyp:google_apis_unittests', '../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', + '../media/cast/cast.gyp:cast_unittests', '../media/media.gyp:media_unittests', '../mojo/mojo.gyp:mojo', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', '../third_party/WebKit/public/all.gyp:all_blink', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../tools/telemetry/telemetry.gyp:*', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', ], }], @@ -271,18 +297,15 @@ 'dependencies': [ '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:installer_util_unittests', - '../chrome/chrome.gyp:mini_installer_test', - # mini_installer_tests depends on mini_installer. This should be - # defined in installer.gyp. + # ../chrome/test/mini_installer requires mini_installer. '../chrome/installer/mini_installer.gyp:mini_installer', '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', + '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', '../courgette/courgette.gyp:courgette_unittests', '../sandbox/sandbox.gyp:sbox_integration_tests', '../sandbox/sandbox.gyp:sbox_unittests', '../sandbox/sandbox.gyp:sbox_validation_tests', - '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin', '../ui/app_list/app_list.gyp:app_list_unittests', - '../ui/views/views.gyp:views_unittests', ], 'conditions': [ # remoting_host_installation uses lots of non-trivial GYP that tend @@ -294,7 +317,7 @@ '../remoting/remoting.gyp:remoting_host_installation', ], }], - ['asan==1', { + ['syzyasan==1', { 'variables': { # Disable incremental linking for all modules. # 0: inherit, 1: disabled, 2: enabled. @@ -310,7 +333,7 @@ ], 'msvs_settings': { 'VCLinkerTool': { - # Enable profile information (necessary for asan + # Enable profile information (necessary for SyzyAsan # instrumentation). This is incompatible with incremental # linking. 'Profile': 'true', @@ -321,8 +344,8 @@ }], ['OS=="linux"', { 'dependencies': [ - '../sandbox/sandbox.gyp:sandbox_linux_unittests', '../dbus/dbus.gyp:dbus_unittests', + '../sandbox/sandbox.gyp:sandbox_linux_unittests', ], }], ['OS=="mac"', { @@ -336,7 +359,7 @@ 'chromium_swarm_tests', ], }], - ['OS!="android" and OS!="ios"', { + ['OS!="android"', { 'dependencies': [ '../google_apis/gcm/gcm.gyp:gcm_unit_tests', ], @@ -348,9 +371,11 @@ }], ['use_aura==1', { 'dependencies': [ + '../ui/app_list/app_list.gyp:app_list_unittests', '../ui/aura/aura.gyp:aura_unittests', '../ui/compositor/compositor.gyp:compositor_unittests', '../ui/keyboard/keyboard.gyp:keyboard_unittests', + '../ui/views/views.gyp:views_unittests', ], }], ['use_aura==1 or toolkit_views==1', { @@ -363,15 +388,13 @@ '../ash/ash.gyp:ash_unittests', ], }], + ['disable_nacl==0', { + 'dependencies': [ + '../components/nacl.gyp:nacl_loader_unittests', + ], + }], ], }, # target_name: chromium_builder_tests - { - 'target_name': 'chromium_2010_builder_tests', - 'type': 'none', - 'dependencies': [ - 'chromium_builder_tests', - ], - }, # target_name: chromium_2010_builder_tests ], 'conditions': [ ['OS!="ios"', { @@ -381,14 +404,26 @@ 'type': 'none', 'dependencies': [ '../third_party/WebKit/public/all.gyp:all_blink', - '../content/content_shell_and_tests.gyp:content_shell', ], '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" + }], + ['OS!="win" and OS!="android"', { 'dependencies': [ '../breakpad/breakpad.gyp:minidump_stackwalk', ], @@ -396,6 +431,7 @@ ['OS=="mac"', { 'dependencies': [ '../breakpad/breakpad.gyp:dump_syms#host', + '../content/content_shell_and_tests.gyp:layout_test_helper', ], }], ['OS=="linux"', { @@ -405,15 +441,10 @@ }], ], }, # target_name: blink_tests - { - # TODO(jochen): Eventually remove this target after everybody and - # the bots started to use blink_tests only. - 'target_name': 'all_webkit', - 'type': 'none', - 'dependencies': [ - 'blink_tests', - ], - }, # target_name: all_webkit + ], + }], # OS!=ios + ['OS!="ios" and OS!="android"', { + 'targets': [ { 'target_name': 'chromium_builder_nacl_win_integration', 'type': 'none', @@ -428,11 +459,12 @@ 'dependencies': [ '../cc/cc_tests.gyp:cc_perftests', '../chrome/chrome.gyp:chrome', + '../chrome/chrome.gyp:load_library_perf_tests', '../chrome/chrome.gyp:performance_browser_tests', - '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:sync_performance_tests', '../media/media.gyp:media_perftests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', + '../tools/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -463,12 +495,12 @@ 'dependencies': [ '../chrome/chrome.gyp:chrome', '../chrome/chrome.gyp:performance_browser_tests', - '../chrome/chrome.gyp:performance_ui_tests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_gl_tests', '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', '../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:angle_unittests', + '../tools/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -503,6 +535,7 @@ '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', '../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:angle_unittests', + '../tools/telemetry/telemetry.gyp:*', ], 'conditions': [ ['OS!="ios" and OS!="win"', { @@ -534,7 +567,6 @@ '../chrome/chrome.gyp:chrome', # Dependencies of pyauto_functional tests. '../remoting/remoting.gyp:remoting_webapp', - '../chrome/chrome.gyp:pyautolib', ], 'conditions': [ ['OS=="mac"', { @@ -570,15 +602,14 @@ { # This target contains everything we need to run tests on the special # device-equipped WebRTC bots. We have device-requiring tests in - # PyAuto, browser_tests and content_browsertests. + # browser_tests and content_browsertests. 'target_name': 'chromium_builder_webrtc', 'type': 'none', 'dependencies': [ - 'chromium_builder_qa', # needed for perf pyauto tests + 'chromium_builder_qa', # TODO(phoglund): not sure if needed? '../chrome/chrome.gyp:browser_tests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', - '../third_party/libjingle/libjingle.gyp:peerconnection_server', '../third_party/webrtc/tools/tools.gyp:frame_analyzer', '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', ], @@ -612,24 +643,32 @@ 'conditions': [ ['OS!="win"', { 'dependencies': [ + '../net/net.gyp:hpack_fuzz_wrapper', '../net/net.gyp:dns_fuzz_stub', '../skia/skia.gyp:filter_fuzz_stub', ], }], - ['OS=="linux" and enable_ipc_fuzzer==1', { + ['enable_ipc_fuzzer==1 and OS=="linux" and component!="shared_library"', { 'dependencies': [ '../tools/ipc_fuzzer/ipc_fuzzer.gyp:*', ], }], + ['chromeos==0', { + 'dependencies': [ + '../v8/src/d8.gyp:d8#host', + '../third_party/pdfium/samples/samples.gyp:pdfium_test', + ], + }], ['internal_filter_fuzzer==1', { 'dependencies': [ '../skia/tools/clusterfuzz-data/fuzzers/filter_fuzzer/filter_fuzzer.gyp:filter_fuzzer', ], }], # internal_filter_fuzzer - ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { + ['OS=="win" and fastbuild==0 and target_arch=="ia32" and syzyasan==1', { 'dependencies': [ '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy', '../content/content_shell_and_tests.gyp:content_shell_syzyasan', + '../pdf/pdf.gyp:pdf_syzyasan', ], 'conditions': [ ['chrome_multiple_dll==1', { @@ -641,8 +680,132 @@ }], ], }, + { + 'target_name': 'chromium_builder_nacl_sdk', + 'type': 'none', + 'dependencies': [ + '../chrome/chrome.gyp:chrome', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../chrome/chrome.gyp:chrome_nacl_win64', + ] + }], + ], + }, #target_name: chromium_builder_nacl_sdk ], # targets - }], + }], #OS!=ios and OS!=android + ['OS=="android"', { + 'targets': [ + { + # The current list of tests for android. This is temporary + # until the full set supported. If adding a new test here, + # please also add it to build/android/pylib/gtest/gtest_config.py, + # else the test is not run. + # + # WARNING: + # Do not add targets here without communicating the implications + # on tryserver triggers and load. Discuss with + # chrome-infrastructure-team please. + 'target_name': 'android_builder_tests', + 'type': 'none', + 'dependencies': [ + '../android_webview/android_webview.gyp:android_webview_unittests', + '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', + '../base/base.gyp:base_unittests', + '../breakpad/breakpad.gyp:breakpad_unittests_stripped', + # Also compile the tools needed to deal with minidumps, they are + # needed to run minidump tests upstream. + '../breakpad/breakpad.gyp:dump_syms#host', + '../breakpad/breakpad.gyp:symupload#host', + '../breakpad/breakpad.gyp:minidump_dump#host', + '../breakpad/breakpad.gyp:minidump_stackwalk#host', + '../build/android/tests/multiple_proguards/multiple_proguards.gyp:multiple_proguards_test_apk', + '../cc/cc_tests.gyp:cc_perftests_apk', + '../cc/cc_tests.gyp:cc_unittests', + '../chrome/chrome.gyp:unit_tests', + '../components/components_tests.gyp:components_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_gl_tests', + '../content/content_shell_and_tests.gyp:chromium_linker_test_apk', + '../content/content_shell_and_tests.gyp:content_shell_test_apk', + '../content/content_shell_and_tests.gyp:content_unittests', + '../gpu/gpu.gyp:gl_tests', + '../gpu/gpu.gyp:gpu_unittests', + '../ipc/ipc.gyp:ipc_tests', + '../media/media.gyp:media_perftests_apk', + '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests', + '../sandbox/sandbox.gyp:sandbox_linux_unittests_stripped', + '../sql/sql.gyp:sql_unittests', + '../sync/sync.gyp:sync_unit_tests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', + '../third_party/WebKit/public/all.gyp:*', + '../tools/android/android_tools.gyp:android_tools', + '../tools/android/android_tools.gyp:memconsumer', + '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', + '../ui/events/events.gyp:events_unittests', + '../ui/ui_unittests.gyp:ui_unittests', + # Unit test bundles packaged as an apk. + '../android_webview/android_webview.gyp:android_webview_test_apk', + '../android_webview/android_webview.gyp:android_webview_unittests_apk', + '../base/base.gyp:base_unittests_apk', + '../cc/cc_tests.gyp:cc_unittests_apk', + '../chrome/chrome.gyp:chrome_shell_test_apk', + '../chrome/chrome.gyp:chrome_shell_uiautomator_tests', + '../chrome/chrome.gyp:unit_tests_apk', + '../components/components_tests.gyp:components_unittests_apk', + '../content/content_shell_and_tests.gyp:content_browsertests_apk', + '../content/content_shell_and_tests.gyp:content_gl_tests_apk', + '../content/content_shell_and_tests.gyp:content_unittests_apk', + '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', + '../gpu/gpu.gyp:gl_tests_apk', + '../gpu/gpu.gyp:gpu_unittests_apk', + '../ipc/ipc.gyp:ipc_tests_apk', + '../media/media.gyp:media_unittests_apk', + '../net/net.gyp:net_unittests_apk', + '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', + '../sql/sql.gyp:sql_unittests_apk', + '../sync/sync.gyp:sync_unit_tests_apk', + '../ui/events/events.gyp:events_unittests_apk', + '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk', + '../ui/ui_unittests.gyp:ui_unittests_apk', + '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests_apk', + ], + }, + { + # WebRTC Android APK tests. + 'target_name': 'android_builder_webrtc', + 'type': 'none', + 'variables': { + # Set default value for include_tests to '0'. It is normally only + # used in WebRTC GYP files. It is set to '1' only when building + # WebRTC for Android, inside a Chromium checkout. + 'include_tests%': 0, + }, + 'conditions': [ + ['include_tests==1', { + 'dependencies': [ + '../third_party/webrtc/build/apk_tests.gyp:*', + ], + }], + ], + }, # target_name: android_builder_webrtc + { + # WebRTC Chromium tests to run on Android. + 'target_name': 'android_builder_chromium_webrtc', + 'type': 'none', + 'dependencies': [ + '../content/content_shell_and_tests.gyp:content_browsertests', + '../tools/android/android_tools.gyp:android_tools', + '../tools/android/android_tools.gyp:memconsumer', + # Unit test bundles packaged as an apk. + '../content/content_shell_and_tests.gyp:content_browsertests_apk', + ], + }, # target_name: android_builder_chromium_webrtc + ], # targets + }], # OS="android" ['OS=="mac"', { 'targets': [ { @@ -683,12 +846,14 @@ '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', + '../tools/telemetry/telemetry.gyp:*', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', - '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', ], }, { @@ -698,7 +863,6 @@ '../cc/cc_tests.gyp:cc_unittests', '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:performance_browser_tests', - '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', @@ -717,9 +881,12 @@ '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', + '../tools/telemetry/telemetry.gyp:*', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', @@ -745,14 +912,6 @@ ], }, { - # TODO(dpranke): Update the bots to refer to 'chromium_builder_asan'. - 'target_name': 'chromium_builder_asan_mac', - 'type': 'none', - 'dependencies': [ - 'chromium_builder_asan' - ], - }, - { 'target_name': 'chromium_builder_dbg_valgrind_mac', 'type': 'none', 'dependencies': [ @@ -773,8 +932,10 @@ '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/ui_unittests.gyp:ui_unittests', '../url/url.gyp:url_unittests', ], @@ -791,20 +952,19 @@ 'dependencies': [ '../cc/cc_tests.gyp:cc_unittests', '../chrome/chrome.gyp:browser_tests', + '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:gcapi_test', '../chrome/chrome.gyp:installer_util_unittests', '../chrome/chrome.gyp:interactive_ui_tests', - '../chrome/chrome.gyp:mini_installer_test', '../chrome/chrome.gyp:performance_browser_tests', - '../chrome/chrome.gyp:performance_ui_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:unit_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components_tests.gyp:components_unittests', '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', - # mini_installer_tests depends on mini_installer. This should be - # defined in installer.gyp. + '../content/content_shell_and_tests.gyp:copy_test_netscape_plugin', + # ../chrome/test/mini_installer requires mini_installer. '../chrome/installer/mini_installer.gyp:mini_installer', '../courgette/courgette.gyp:courgette_unittests', '../device/device_tests.gyp:device_unittests', @@ -819,15 +979,24 @@ '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', + '../tools/telemetry/telemetry.gyp:*', '../ui/events/events.gyp:events_unittests', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', '../ui/ui_unittests.gyp:ui_unittests', '../ui/views/views.gyp:views_unittests', '../url/url.gyp:url_unittests', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', - '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin', + ], + 'conditions': [ + ['target_arch=="ia32"', { + 'dependencies': [ + '../chrome/chrome.gyp:crash_service_win64', + ], + }], ], }, { @@ -865,18 +1034,26 @@ '../chrome/chrome.gyp:browser_tests', '../cloud_print/cloud_print.gyp:cloud_print_unittests', '../components/components_tests.gyp:components_unittests', + '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content_shell_and_tests.gyp:content_shell', + '../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:content_unittests', '../crypto/crypto.gyp:crypto_unittests', '../device/device_tests.gyp:device_unittests', '../ipc/ipc.gyp:ipc_tests', '../jingle/jingle.gyp:jingle_unittests', '../media/media.gyp:media_unittests', + '../mojo/mojo.gyp:mojo', '../net/net.gyp:net_unittests', '../google_apis/gcm/gcm.gyp:gcm_unit_tests', + '../gpu/gpu.gyp:gpu_unittests', '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_unittests', '../sql/sql.gyp:sql_unittests', + '../sync/sync.gyp:sync_unit_tests', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests', + '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests', '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests', '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests', '../url/url.gyp:url_unittests', @@ -897,28 +1074,32 @@ 'target_name': 'chrome_official_builder', 'type': 'none', 'dependencies': [ + '../base/base.gyp:base_unittests', + '../chrome/chrome.gyp:browser_tests', '../chrome/chrome.gyp:crash_service', '../chrome/chrome.gyp:gcapi_dll', '../chrome/chrome.gyp:pack_policy_templates', - '../courgette/courgette.gyp:courgette64', '../chrome/installer/mini_installer.gyp:mini_installer', - '../courgette/courgette.gyp:courgette', '../cloud_print/cloud_print.gyp:cloud_print', + '../courgette/courgette.gyp:courgette', + '../courgette/courgette.gyp:courgette64', + '../ipc/ipc.gyp:ipc_tests', + '../media/media.gyp:media_unittests', + '../net/net.gyp:net_unittests_run', + '../printing/printing.gyp:printing_unittests', '../remoting/remoting.gyp:remoting_webapp', + '../sql/sql.gyp:sql_unittests', + '../sync/sync.gyp:sync_unit_tests', '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', - '../chrome/chrome.gyp:pyautolib', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', + '../ui/ui_unittests.gyp:ui_unittests', + '../ui/views/views.gyp:views_unittests', + '../url/url.gyp:url_unittests', ], 'conditions': [ - ['internal_pdf', { - 'dependencies': [ - '../pdf/pdf.gyp:pdf', - ], - }], # internal_pdf ['target_arch=="ia32"', { 'dependencies': [ '../chrome/chrome.gyp:crash_service_win64', - # Omitting tests from Win64 to speed up cycle times. - '../chrome/chrome.gyp:interactive_ui_tests', ], }], ['component != "shared_library" and wix_exists == "True" and \ @@ -948,19 +1129,23 @@ '../content/content_shell_and_tests.gyp:content_browsertests', '../content/content_shell_and_tests.gyp:content_unittests', '../device/device_tests.gyp:device_unittests', + '../google_apis/gcm/gcm.gyp:gcm_unit_tests', '../ppapi/ppapi_internal.gyp:ppapi_unittests', '../remoting/remoting.gyp:remoting_unittests', '../ui/app_list/app_list.gyp:*', '../ui/aura/aura.gyp:*', '../ui/compositor/compositor.gyp:*', + '../ui/display/display.gyp:display_unittests', '../ui/events/events.gyp:*', + '../ui/gfx/gfx_tests.gyp:gfx_unittests', + '../ui/keyboard/keyboard.gyp:*', '../ui/message_center/message_center.gyp:*', - '../ui/ui_unittests.gyp:ui_unittests', '../ui/snapshot/snapshot.gyp:snapshot_unittests', + '../ui/ui_unittests.gyp:ui_unittests', + '../ui/views/examples/examples.gyp:views_examples_with_content_exe', '../ui/views/views.gyp:views', - '../ui/views/views.gyp:views_examples_with_content_exe', '../ui/views/views.gyp:views_unittests', - '../ui/keyboard/keyboard.gyp:*', + '../ui/wm/wm.gyp:*', '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests', 'blink_tests', ], @@ -993,11 +1178,35 @@ ['chromeos==1', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos_unittests', + '../athena/main/athena_main.gyp:*', + ], + }], + ['use_ozone==1', { + 'dependencies': [ + '../ui/ozone/ozone.gyp:*', + ], + 'dependencies!': [ + '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 ], }], ], }, ], # targets + }, { + 'conditions': [ + ['OS=="linux"', { + # TODO(thakis): Remove this once the linux gtk bot no longer references + # it (probably after the first aura release on linux), see r249162 + 'targets': [ + { + 'target_name': 'aura_builder', + 'type': 'none', + 'dependencies': [ + '../chrome/chrome.gyp:chrome', + ], + }, + ], # targets + }]], # OS=="linux" }], # "use_aura==1" ['test_isolation_mode != "noop"', { 'targets': [ @@ -1008,12 +1217,26 @@ '../base/base.gyp:base_unittests_run', '../chrome/chrome.gyp:browser_tests_run', '../chrome/chrome.gyp:interactive_ui_tests_run', - '../chrome/chrome.gyp:sync_integration_tests_run', + # http://crbug.com/157234 + #'../chrome/chrome.gyp:sync_integration_tests_run', '../chrome/chrome.gyp:unit_tests_run', '../net/net.gyp:net_unittests_run', ], }, # target_name: chromium_swarm_tests ], }], - ], # conditions + ['OS=="mac" and toolkit_views==1', { + 'targets': [ + { + 'target_name': 'macviews_builder', + 'type': 'none', + 'dependencies': [ + '../ui/views/examples/examples.gyp:views_examples_with_content_exe', + '../ui/views/views.gyp:views', + '../ui/views/views.gyp:views_unittests', + ], + }, # target_name: macviews_builder + ], # targets + }], # os=='mac' and toolkit_views==1 + ], # conditions } |