| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { |
| 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], |
| 10 }, |
| 6 'targets': [ | 11 'targets': [ |
| 7 { | 12 { |
| 8 'target_name': 'All', | 13 'target_name': 'All', |
| 9 'type': 'none', | 14 'type': 'none', |
| 10 'xcode_create_dependents_test_runner': 1, | 15 'xcode_create_dependents_test_runner': 1, |
| 11 'dependencies': [ | 16 'dependencies': [ |
| 12 'some.gyp:*', | 17 'some.gyp:*', |
| 13 '../base/base.gyp:*', | 18 '../base/base.gyp:*', |
| 14 '../chrome/chrome.gyp:*', | |
| 15 '../components/components.gyp:*', | 19 '../components/components.gyp:*', |
| 16 '../components/components_tests.gyp:*', | 20 '../components/components_tests.gyp:*', |
| 17 '../content/content.gyp:*', | 21 '../content/content.gyp:*', |
| 18 '../content/content_shell_and_tests.gyp:*', | |
| 19 '../crypto/crypto.gyp:*', | 22 '../crypto/crypto.gyp:*', |
| 20 '../net/net.gyp:*', | 23 '../net/net.gyp:*', |
| 21 '../sdch/sdch.gyp:*', | 24 '../sdch/sdch.gyp:*', |
| 22 '../sql/sql.gyp:*', | 25 '../sql/sql.gyp:*', |
| 23 '../sync/sync.gyp:*', | |
| 24 '../testing/gmock.gyp:*', | 26 '../testing/gmock.gyp:*', |
| 25 '../testing/gtest.gyp:*', | 27 '../testing/gtest.gyp:*', |
| 26 '../third_party/icu/icu.gyp:*', | 28 '../third_party/icu/icu.gyp:*', |
| 27 '../third_party/libxml/libxml.gyp:*', | 29 '../third_party/libxml/libxml.gyp:*', |
| 28 '../third_party/sqlite/sqlite.gyp:*', | 30 '../third_party/sqlite/sqlite.gyp:*', |
| 29 '../third_party/zlib/zlib.gyp:*', | 31 '../third_party/zlib/zlib.gyp:*', |
| 30 '../ui/accessibility/accessibility.gyp:*', | 32 '../ui/accessibility/accessibility.gyp:*', |
| 31 '../ui/snapshot/snapshot.gyp:*', | 33 '../ui/snapshot/snapshot.gyp:*', |
| 32 '../ui/ui.gyp:*', | 34 '../ui/ui.gyp:*', |
| 33 '../url/url.gyp:*', | 35 '../url/url.gyp:*', |
| 34 ], | 36 ], |
| 35 'conditions': [ | 37 'conditions': [ |
| 36 ['OS!="ios"', { | 38 ['OS=="ios"', { |
| 39 'dependencies': [ |
| 40 '../ios/ios.gyp:*', |
| 41 '../ui/ui_unittests.gyp:ui_unittests', |
| 42 ], |
| 43 }], |
| 44 ['OS=="android"', { |
| 45 'dependencies': [ |
| 46 '../content/content_shell_and_tests.gyp:content_shell_apk', |
| 47 '../mojo/mojo.gyp:mojo_shell_apk', |
| 48 '<@(android_app_targets)', |
| 49 'android_builder_tests', |
| 50 '../android_webview/android_webview.gyp:android_webview_apk', |
| 51 '../chrome/chrome.gyp:chromium_testshell', |
| 52 '../remoting/remoting.gyp:remoting_apk', |
| 53 '../tools/telemetry/telemetry.gyp:*#host', |
| 54 # TODO(nyquist) This should instead by a target for sync when all of |
| 55 # the sync-related code for Android has been upstreamed. |
| 56 # See http://crbug.com/159203 |
| 57 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
ation_javalib', |
| 58 ], |
| 59 }, { |
| 60 'dependencies': [ |
| 61 '../content/content_shell_and_tests.gyp:*', |
| 62 # TODO: This should build on Android and the target should move to t
he list above. |
| 63 '../sync/sync.gyp:*', |
| 64 ], |
| 65 }], |
| 66 ['OS!="ios" and OS!="android"', { |
| 37 'dependencies': [ | 67 'dependencies': [ |
| 38 '../third_party/re2/re2.gyp:re2', | 68 '../third_party/re2/re2.gyp:re2', |
| 69 '../chrome/chrome.gyp:*', |
| 39 '../cc/cc_tests.gyp:*', | 70 '../cc/cc_tests.gyp:*', |
| 40 '../device/bluetooth/bluetooth.gyp:*', | 71 '../device/bluetooth/bluetooth.gyp:*', |
| 41 '../device/device_tests.gyp:*', | 72 '../device/device_tests.gyp:*', |
| 42 '../device/usb/usb.gyp:*', | 73 '../device/usb/usb.gyp:*', |
| 43 '../gin/gin.gyp:*', | 74 '../gin/gin.gyp:*', |
| 44 '../gpu/gpu.gyp:*', | 75 '../gpu/gpu.gyp:*', |
| 45 '../gpu/tools/tools.gyp:*', | 76 '../gpu/tools/tools.gyp:*', |
| 46 '../ipc/ipc.gyp:*', | 77 '../ipc/ipc.gyp:*', |
| 47 '../jingle/jingle.gyp:*', | 78 '../jingle/jingle.gyp:*', |
| 48 '../media/cast/cast.gyp:*', | 79 '../media/cast/cast.gyp:*', |
| (...skipping 19 matching lines...) Expand all Loading... |
| 68 '../third_party/ots/ots.gyp:*', | 99 '../third_party/ots/ots.gyp:*', |
| 69 '../third_party/qcms/qcms.gyp:*', | 100 '../third_party/qcms/qcms.gyp:*', |
| 70 '../tools/gn/gn.gyp:*', | 101 '../tools/gn/gn.gyp:*', |
| 71 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', | 102 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', |
| 72 '../tools/telemetry/telemetry.gyp:*', | 103 '../tools/telemetry/telemetry.gyp:*', |
| 73 '../v8/tools/gyp/v8.gyp:*', | 104 '../v8/tools/gyp/v8.gyp:*', |
| 74 '../webkit/glue/webkit_glue.gyp:*', | 105 '../webkit/glue/webkit_glue.gyp:*', |
| 75 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:*', | 106 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:*', |
| 76 '<(libjpeg_gyp_path):*', | 107 '<(libjpeg_gyp_path):*', |
| 77 ], | 108 ], |
| 78 }, { # 'OS=="ios"' | |
| 79 'dependencies': [ | |
| 80 '../ios/ios.gyp:*', | |
| 81 '../ui/ui_unittests.gyp:ui_unittests', | |
| 82 ], | |
| 83 }], | 109 }], |
| 84 ['OS!="android" and OS!="ios"', { | 110 ['OS!="android" and OS!="ios"', { |
| 85 'dependencies': [ | 111 'dependencies': [ |
| 86 '../chrome/tools/profile_reset/jtl_compiler.gyp:*', | 112 '../chrome/tools/profile_reset/jtl_compiler.gyp:*', |
| 87 ], | 113 ], |
| 88 }], | 114 }], |
| 89 ['os_posix==1 and OS!="android" and OS!="ios"', { | 115 ['os_posix==1 and OS!="android" and OS!="ios"', { |
| 90 'dependencies': [ | 116 'dependencies': [ |
| 91 '../third_party/yasm/yasm.gyp:*#host', | 117 '../third_party/yasm/yasm.gyp:*#host', |
| 92 ], | 118 ], |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 'type': 'none', | 241 'type': 'none', |
| 216 'conditions': [ | 242 'conditions': [ |
| 217 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { | 243 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { |
| 218 'dependencies': [ | 244 'dependencies': [ |
| 219 '../chrome/installer/mini_installer_syzygy.gyp:*', | 245 '../chrome/installer/mini_installer_syzygy.gyp:*', |
| 220 ], | 246 ], |
| 221 }], | 247 }], |
| 222 ], | 248 ], |
| 223 }, # target_name: All_syzygy | 249 }, # target_name: All_syzygy |
| 224 { | 250 { |
| 251 # Note: Android uses android_builder_tests below. |
| 252 # TODO: Consider merging that with this target. |
| 225 'target_name': 'chromium_builder_tests', | 253 'target_name': 'chromium_builder_tests', |
| 226 'type': 'none', | 254 'type': 'none', |
| 227 'dependencies': [ | 255 'dependencies': [ |
| 228 '../base/base.gyp:base_unittests', | 256 '../base/base.gyp:base_unittests', |
| 229 '../components/components_tests.gyp:components_unittests', | 257 '../components/components_tests.gyp:components_unittests', |
| 230 '../crypto/crypto.gyp:crypto_unittests', | 258 '../crypto/crypto.gyp:crypto_unittests', |
| 231 '../net/net.gyp:net_unittests', | 259 '../net/net.gyp:net_unittests', |
| 232 '../sql/sql.gyp:sql_unittests', | 260 '../sql/sql.gyp:sql_unittests', |
| 233 '../sync/sync.gyp:sync_unit_tests', | 261 '../sync/sync.gyp:sync_unit_tests', |
| 234 '../ui/ui_unittests.gyp:ui_unittests', | 262 '../ui/ui_unittests.gyp:ui_unittests', |
| 235 '../url/url.gyp:url_unittests', | 263 '../url/url.gyp:url_unittests', |
| 236 ], | 264 ], |
| 237 'conditions': [ | 265 'conditions': [ |
| 238 ['OS!="ios"', { | 266 ['OS!="ios" and OS!="android"', { |
| 239 'dependencies': [ | 267 'dependencies': [ |
| 240 '../cc/cc_tests.gyp:cc_unittests', | 268 '../cc/cc_tests.gyp:cc_unittests', |
| 241 '../chrome/chrome.gyp:browser_tests', | 269 '../chrome/chrome.gyp:browser_tests', |
| 242 '../chrome/chrome.gyp:chromedriver_tests', | 270 '../chrome/chrome.gyp:chromedriver_tests', |
| 243 '../chrome/chrome.gyp:chromedriver_unittests', | 271 '../chrome/chrome.gyp:chromedriver_unittests', |
| 244 # TODO(kkania): Remove these after infra no longer depends on them. | 272 # TODO(kkania): Remove these after infra no longer depends on them. |
| 245 '../chrome/chrome.gyp:chromedriver2_unittests', | 273 '../chrome/chrome.gyp:chromedriver2_unittests', |
| 246 '../chrome/chrome.gyp:interactive_ui_tests', | 274 '../chrome/chrome.gyp:interactive_ui_tests', |
| 247 '../chrome/chrome.gyp:sync_integration_tests', | 275 '../chrome/chrome.gyp:sync_integration_tests', |
| 248 '../chrome/chrome.gyp:unit_tests', | 276 '../chrome/chrome.gyp:unit_tests', |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 }, # target_name: chromium_2010_builder_tests | 405 }, # target_name: chromium_2010_builder_tests |
| 378 ], | 406 ], |
| 379 'conditions': [ | 407 'conditions': [ |
| 380 ['OS!="ios"', { | 408 ['OS!="ios"', { |
| 381 'targets': [ | 409 'targets': [ |
| 382 { | 410 { |
| 383 'target_name': 'blink_tests', | 411 'target_name': 'blink_tests', |
| 384 'type': 'none', | 412 'type': 'none', |
| 385 'dependencies': [ | 413 'dependencies': [ |
| 386 '../third_party/WebKit/public/all.gyp:all_blink', | 414 '../third_party/WebKit/public/all.gyp:all_blink', |
| 387 '../content/content_shell_and_tests.gyp:content_shell', | |
| 388 ], | 415 ], |
| 389 'conditions': [ | 416 'conditions': [ |
| 417 ['OS=="android"', { |
| 418 'dependencies': [ |
| 419 '../content/content_shell_and_tests.gyp:content_shell_apk', |
| 420 '../breakpad/breakpad.gyp:dump_syms#host', |
| 421 '../breakpad/breakpad.gyp:minidump_stackwalk#host', |
| 422 ], |
| 423 }, { # OS!="android" |
| 424 'dependencies': [ |
| 425 '../content/content_shell_and_tests.gyp:content_shell', |
| 426 ], |
| 427 }], |
| 390 ['OS=="win"', { | 428 ['OS=="win"', { |
| 391 'dependencies': [ | 429 'dependencies': [ |
| 392 '../content/content_shell_and_tests.gyp:content_shell_crash_serv
ice', | 430 '../content/content_shell_and_tests.gyp:content_shell_crash_serv
ice', |
| 393 '../content/content_shell_and_tests.gyp:layout_test_helper', | 431 '../content/content_shell_and_tests.gyp:layout_test_helper', |
| 394 ], | 432 ], |
| 395 }, { # OS!="win" | 433 }], |
| 434 ['OS!="win" and OS!="android"', { |
| 396 'dependencies': [ | 435 'dependencies': [ |
| 397 '../breakpad/breakpad.gyp:minidump_stackwalk', | 436 '../breakpad/breakpad.gyp:minidump_stackwalk', |
| 398 ], | 437 ], |
| 399 }], | 438 }], |
| 400 ['OS=="mac"', { | 439 ['OS=="mac"', { |
| 401 'dependencies': [ | 440 'dependencies': [ |
| 402 '../breakpad/breakpad.gyp:dump_syms#host', | 441 '../breakpad/breakpad.gyp:dump_syms#host', |
| 403 '../content/content_shell_and_tests.gyp:layout_test_helper', | 442 '../content/content_shell_and_tests.gyp:layout_test_helper', |
| 404 ], | 443 ], |
| 405 }], | 444 }], |
| 406 ['OS=="linux"', { | 445 ['OS=="linux"', { |
| 407 'dependencies': [ | 446 'dependencies': [ |
| 408 '../breakpad/breakpad.gyp:dump_syms', | 447 '../breakpad/breakpad.gyp:dump_syms', |
| 409 ], | 448 ], |
| 410 }], | 449 }], |
| 411 ], | 450 ], |
| 412 }, # target_name: blink_tests | 451 }, # target_name: blink_tests |
| 413 { | 452 { |
| 414 # TODO(jochen): Eventually remove this target after everybody and | 453 # TODO(jochen): Eventually remove this target after everybody and |
| 415 # the bots started to use blink_tests only. | 454 # the bots started to use blink_tests only. |
| 416 'target_name': 'all_webkit', | 455 'target_name': 'all_webkit', |
| 417 'type': 'none', | 456 'type': 'none', |
| 418 'dependencies': [ | 457 'dependencies': [ |
| 419 'blink_tests', | 458 'blink_tests', |
| 420 ], | 459 ], |
| 421 }, # target_name: all_webkit | 460 }, # target_name: all_webkit |
| 461 ], |
| 462 }], # OS!=ios |
| 463 ['OS!="ios" and OS!="android"', { |
| 464 'targets': [ |
| 422 { | 465 { |
| 423 'target_name': 'chromium_builder_nacl_win_integration', | 466 'target_name': 'chromium_builder_nacl_win_integration', |
| 424 'type': 'none', | 467 'type': 'none', |
| 425 'dependencies': [ | 468 'dependencies': [ |
| 426 'chromium_builder_qa', # needed for pyauto | 469 'chromium_builder_qa', # needed for pyauto |
| 427 'chromium_builder_tests', | 470 'chromium_builder_tests', |
| 428 ], | 471 ], |
| 429 }, # target_name: chromium_builder_nacl_win_integration | 472 }, # target_name: chromium_builder_nacl_win_integration |
| 430 { | 473 { |
| 431 'target_name': 'chromium_builder_perf', | 474 'target_name': 'chromium_builder_perf', |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 ['chrome_multiple_dll==1', { | 686 ['chrome_multiple_dll==1', { |
| 644 'dependencies': [ | 687 'dependencies': [ |
| 645 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy', | 688 '../chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy', |
| 646 ], | 689 ], |
| 647 }], | 690 }], |
| 648 ], | 691 ], |
| 649 }], | 692 }], |
| 650 ], | 693 ], |
| 651 }, | 694 }, |
| 652 ], # targets | 695 ], # targets |
| 653 }], | 696 }], #OS!=ios and OS!=android |
| 697 ['OS=="android"', { |
| 698 'targets': [ |
| 699 { |
| 700 # The current list of tests for android. This is temporary |
| 701 # until the full set supported. If adding a new test here, |
| 702 # please also add it to build/android/pylib/gtest/gtest_config.py, |
| 703 # else the test is not run. |
| 704 # |
| 705 # WARNING: |
| 706 # Do not add targets here without communicating the implications |
| 707 # on tryserver triggers and load. Discuss with |
| 708 # chrome-infrastructure-team please. |
| 709 'target_name': 'android_builder_tests', |
| 710 'type': 'none', |
| 711 'dependencies': [ |
| 712 '../android_webview/android_webview.gyp:android_webview_unittests', |
| 713 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests
', |
| 714 '../base/base.gyp:base_unittests', |
| 715 '../breakpad/breakpad.gyp:breakpad_unittests', |
| 716 # Also compile the tools needed to deal with minidumps, they are |
| 717 # needed to run minidump tests upstream. |
| 718 '../breakpad/breakpad.gyp:dump_syms#host', |
| 719 '../breakpad/breakpad.gyp:symupload#host', |
| 720 '../breakpad/breakpad.gyp:minidump_dump#host', |
| 721 '../breakpad/breakpad.gyp:minidump_stackwalk#host', |
| 722 '../build/android/tests/multiple_proguards/multiple_proguards.gyp:mu
ltiple_proguards_test_apk', |
| 723 '../cc/cc_tests.gyp:cc_perftests_apk', |
| 724 '../cc/cc_tests.gyp:cc_unittests', |
| 725 '../chrome/chrome.gyp:unit_tests', |
| 726 '../components/components_tests.gyp:components_unittests', |
| 727 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 728 '../content/content_shell_and_tests.gyp:content_gl_tests', |
| 729 '../content/content_shell_and_tests.gyp:content_shell_test_apk', |
| 730 '../content/content_shell_and_tests.gyp:content_unittests', |
| 731 '../gpu/gpu.gyp:gl_tests', |
| 732 '../gpu/gpu.gyp:gpu_unittests', |
| 733 '../ipc/ipc.gyp:ipc_tests', |
| 734 '../media/media.gyp:media_perftests_apk', |
| 735 '../media/media.gyp:media_unittests', |
| 736 '../net/net.gyp:net_unittests', |
| 737 '../sandbox/sandbox.gyp:sandbox_linux_unittests', |
| 738 '../sql/sql.gyp:sql_unittests', |
| 739 '../sync/sync.gyp:sync_unit_tests', |
| 740 '../third_party/WebKit/public/all.gyp:*', |
| 741 '../tools/android/android_tools.gyp:android_tools', |
| 742 '../tools/android/android_tools.gyp:memconsumer', |
| 743 '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugi
n_test', |
| 744 '../ui/ui_unittests.gyp:ui_unittests', |
| 745 # Required by ui_unittests. |
| 746 # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but |
| 747 # this would cause circular gyp dependency which needs refactoring t
he |
| 748 # gyps to resolve. |
| 749 '../chrome/chrome_resources.gyp:packed_resources', |
| 750 ], |
| 751 'conditions': [ |
| 752 ['"<(gtest_target_type)"=="shared_library"', { |
| 753 'dependencies': [ |
| 754 # Unit test bundles packaged as an apk. |
| 755 '../android_webview/android_webview.gyp:android_webview_unittest
s_apk', |
| 756 '../base/base.gyp:base_unittests_apk', |
| 757 '../cc/cc_tests.gyp:cc_unittests_apk', |
| 758 '../chrome/chrome.gyp:unit_tests_apk', |
| 759 '../components/components_tests.gyp:components_unittests_apk', |
| 760 '../content/content_shell_and_tests.gyp:content_browsertests_apk
', |
| 761 '../content/content_shell_and_tests.gyp:content_gl_tests_apk', |
| 762 '../content/content_shell_and_tests.gyp:content_unittests_apk', |
| 763 '../content/content_shell_and_tests.gyp:video_decode_accelerator
_unittest_apk', |
| 764 '../gpu/gpu.gyp:gl_tests_apk', |
| 765 '../gpu/gpu.gyp:gpu_unittests_apk', |
| 766 '../ipc/ipc.gyp:ipc_tests_apk', |
| 767 '../media/media.gyp:media_unittests_apk', |
| 768 '../net/net.gyp:net_unittests_apk', |
| 769 '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk', |
| 770 '../sql/sql.gyp:sql_unittests_apk', |
| 771 '../sync/sync.gyp:sync_unit_tests_apk', |
| 772 '../ui/ui_unittests.gyp:ui_unittests_apk', |
| 773 '../android_webview/android_webview.gyp:android_webview_test_apk
', |
| 774 '../chrome/chrome.gyp:chromium_testshell_test_apk', |
| 775 '../chrome/chrome.gyp:chromium_testshell_uiautomator_tests', |
| 776 '../webkit/renderer/compositor_bindings/compositor_bindings_test
s.gyp:webkit_compositor_bindings_unittests_apk' |
| 777 ], |
| 778 }], |
| 779 ], |
| 780 }, |
| 781 { |
| 782 # WebRTC Android APK tests. |
| 783 'target_name': 'android_builder_webrtc', |
| 784 'type': 'none', |
| 785 'variables': { |
| 786 # Set default value for include_tests to '0'. It is normally only |
| 787 # used in WebRTC GYP files. It is set to '1' only when building |
| 788 # WebRTC for Android, inside a Chromium checkout. |
| 789 'include_tests%': 0, |
| 790 }, |
| 791 'conditions': [ |
| 792 ['"<(gtest_target_type)"=="shared_library" and include_tests==1', { |
| 793 'dependencies': [ |
| 794 '../third_party/webrtc/build/apk_tests.gyp:*', |
| 795 ], |
| 796 }], |
| 797 ], |
| 798 }, # target_name: android_builder_webrtc |
| 799 { |
| 800 # WebRTC Chromium tests to run on Android. |
| 801 'target_name': 'android_builder_chromium_webrtc', |
| 802 'type': 'none', |
| 803 'dependencies': [ |
| 804 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 805 '../tools/android/android_tools.gyp:android_tools', |
| 806 '../tools/android/android_tools.gyp:memconsumer', |
| 807 ], |
| 808 'conditions': [ |
| 809 ['"<(gtest_target_type)"=="shared_library"', { |
| 810 'dependencies': [ |
| 811 # Unit test bundles packaged as an apk. |
| 812 '../content/content_shell_and_tests.gyp:content_browsertests_apk
', |
| 813 ], |
| 814 }], |
| 815 ], |
| 816 }, # target_name: android_builder_chromium_webrtc |
| 817 { |
| 818 # Build the java portions of the binary size analysis tool. |
| 819 'target_name': 'binary_size_tool', |
| 820 'type': 'none', |
| 821 'dependencies': [ |
| 822 '../tools/binary_size/binary_size.gyp:binary_size_java', |
| 823 ], |
| 824 }, |
| 825 ], # targets |
| 826 }], # OS="android" |
| 654 ['OS=="mac"', { | 827 ['OS=="mac"', { |
| 655 'targets': [ | 828 'targets': [ |
| 656 { | 829 { |
| 657 # Target to build everything plus the dmg. We don't put the dmg | 830 # Target to build everything plus the dmg. We don't put the dmg |
| 658 # in the All target because developers really don't need it. | 831 # in the All target because developers really don't need it. |
| 659 'target_name': 'all_and_dmg', | 832 'target_name': 'all_and_dmg', |
| 660 'type': 'none', | 833 'type': 'none', |
| 661 'dependencies': [ | 834 'dependencies': [ |
| 662 'All', | 835 'All', |
| 663 '../chrome/chrome.gyp:build_app_dmg', | 836 '../chrome/chrome.gyp:build_app_dmg', |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1206 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1034 '../chrome/chrome.gyp:sync_integration_tests_run', | 1207 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1035 '../chrome/chrome.gyp:unit_tests_run', | 1208 '../chrome/chrome.gyp:unit_tests_run', |
| 1036 '../net/net.gyp:net_unittests_run', | 1209 '../net/net.gyp:net_unittests_run', |
| 1037 ], | 1210 ], |
| 1038 }, # target_name: chromium_swarm_tests | 1211 }, # target_name: chromium_swarm_tests |
| 1039 ], | 1212 ], |
| 1040 }], | 1213 }], |
| 1041 ], # conditions | 1214 ], # conditions |
| 1042 } | 1215 } |
| OLD | NEW |