| OLD | NEW | 
|---|
| 1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2015 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 # This file defines five targets that we are using to track the progress of the | 5 # This file defines five targets that we are using to track the progress of the | 
| 6 # GYP->GN migration: | 6 # GYP->GN migration: | 
| 7 # | 7 # | 
| 8 # 'both_gn_and_gyp' lists what GN is currently capable of building and should | 8 # 'both_gn_and_gyp' lists what GN is currently capable of building and should | 
| 9 # match the 'both_gn_and_gyp' target in //BUILD.gn. | 9 # match the 'both_gn_and_gyp' target in //BUILD.gn. | 
| 10 # | 10 # | 
| 11 # 'gyp_all' Should include everything built when building "all"; i.e., if you | 11 # 'gyp_all' Should include everything built when building "all"; i.e., if you | 
| 12 # type 'ninja gyp_all' and then 'ninja all', the second build should do | 12 # type 'ninja gyp_all' and then 'ninja all', the second build should do | 
| 13 # nothing. 'gyp_all' should just depend on the other four targets. | 13 # nothing. 'gyp_all' should just depend on the other four targets. | 
| 14 # | 14 # | 
| 15 # 'gyp_remaining' lists all of the targets that still need to be converted, | 15 # 'gyp_remaining' lists all of the targets that still need to be converted, | 
| 16 # i.e., all of the other (non-empty) targets that a GYP build will build. | 16 # i.e., all of the other (non-empty) targets that a GYP build will build. | 
| 17 # | 17 # | 
| 18 # TODO(GYP): crbug.com/481694. Add a build step to the bot that enforces the | 18 # TODO(GYP): crbug.com/481694. Add a build step to the bot that enforces the | 
| 19 # above contracts. | 19 # above contracts. | 
| 20 | 20 | 
| 21 { | 21 { | 
|  | 22   'includes': [ | 
|  | 23     '../media/media_variables.gypi' | 
|  | 24   ], | 
| 22   'targets': [ | 25   'targets': [ | 
| 23     { | 26     { | 
| 24       'target_name': 'gyp_all', | 27       'target_name': 'gyp_all', | 
| 25       'type': 'none', | 28       'type': 'none', | 
| 26       'dependencies': [ | 29       'dependencies': [ | 
| 27         'both_gn_and_gyp', | 30         'both_gn_and_gyp', | 
| 28         'gyp_remaining', | 31         'gyp_remaining', | 
| 29       ] | 32       ] | 
| 30     }, | 33     }, | 
| 31     { | 34     { | 
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 353             '../chrome/chrome.gyp:performance_browser_tests', | 356             '../chrome/chrome.gyp:performance_browser_tests', | 
| 354             '../chrome/chrome.gyp:sync_integration_tests', | 357             '../chrome/chrome.gyp:sync_integration_tests', | 
| 355             '../chrome/chrome.gyp:sync_performance_tests', | 358             '../chrome/chrome.gyp:sync_performance_tests', | 
| 356             '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler', | 359             '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler', | 
| 357             '../extensions/extensions_tests.gyp:extensions_browsertests', | 360             '../extensions/extensions_tests.gyp:extensions_browsertests', | 
| 358             '../extensions/extensions_tests.gyp:extensions_unittests', | 361             '../extensions/extensions_tests.gyp:extensions_unittests', | 
| 359             '../gin/gin.gyp:gin_shell', | 362             '../gin/gin.gyp:gin_shell', | 
| 360             '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_t
     est',  # TODO(GYP) crbug.com/471920 | 363             '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_t
     est',  # TODO(GYP) crbug.com/471920 | 
| 361             '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_t
     est',  # TODO(GYP) crbug.com/471903 to make this complete. | 364             '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_t
     est',  # TODO(GYP) crbug.com/471903 to make this complete. | 
| 362             '../ipc/ipc.gyp:ipc_perftests', | 365             '../ipc/ipc.gyp:ipc_perftests', | 
| 363             '../media/media.gyp:ffmpeg_regression_tests',  # TODO(GYP) this shou
     ld be conditional on media_use_ffmpeg |  | 
| 364             '../mojo/mojo_base.gyp:mojo_common_unittests', | 366             '../mojo/mojo_base.gyp:mojo_common_unittests', | 
| 365             '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma', | 367             '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma', | 
| 366             '../skia/skia.gyp:filter_fuzz_stub', | 368             '../skia/skia.gyp:filter_fuzz_stub', | 
| 367             '../skia/skia.gyp:image_operations_bench', | 369             '../skia/skia.gyp:image_operations_bench', | 
| 368             '../sync/tools/sync_tools.gyp:sync_client', | 370             '../sync/tools/sync_tools.gyp:sync_client', | 
| 369             '../sync/tools/sync_tools.gyp:sync_listen_notifications', | 371             '../sync/tools/sync_tools.gyp:sync_listen_notifications', | 
| 370             '../third_party/codesighs/codesighs.gyp:codesighs', | 372             '../third_party/codesighs/codesighs.gyp:codesighs', | 
| 371             '../third_party/codesighs/codesighs.gyp:maptsvdifftool', | 373             '../third_party/codesighs/codesighs.gyp:maptsvdifftool', | 
| 372             '../third_party/pdfium/samples/samples.gyp:pdfium_diff', | 374             '../third_party/pdfium/samples/samples.gyp:pdfium_diff', | 
| 373             '../third_party/pdfium/samples/samples.gyp:pdfium_test', | 375             '../third_party/pdfium/samples/samples.gyp:pdfium_test', | 
| 374             '../tools/gn/gn.gyp:generate_test_gn_data', | 376             '../tools/gn/gn.gyp:generate_test_gn_data', | 
| 375             '../tools/gn/gn.gyp:gn', | 377             '../tools/gn/gn.gyp:gn', | 
| 376             '../tools/gn/gn.gyp:gn_unittests', | 378             '../tools/gn/gn.gyp:gn_unittests', | 
| 377             '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_syste
     m_cache', | 379             '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_syste
     m_cache', | 
| 378             '../ui/message_center/message_center.gyp:message_center_unittests', | 380             '../ui/message_center/message_center.gyp:message_center_unittests', | 
| 379             '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 381             '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 
| 380           ], | 382           ], | 
| 381         }], | 383         }], | 
|  | 384         ['media_use_ffmpeg==1', { | 
|  | 385           'dependencies': [ | 
|  | 386             '../media/media.gyp:ffmpeg_regression_tests', | 
|  | 387           ], | 
|  | 388         }], | 
| 382         ['OS=="android" or OS=="linux"', { | 389         ['OS=="android" or OS=="linux"', { | 
| 383           'dependencies': [ | 390           'dependencies': [ | 
| 384             '../net/net.gyp:disk_cache_memory_test', | 391             '../net/net.gyp:disk_cache_memory_test', | 
| 385           ], | 392           ], | 
| 386         }], | 393         }], | 
| 387         ['chromeos==1', { | 394         ['chromeos==1', { | 
| 388           'dependencies': [ | 395           'dependencies': [ | 
| 389             '../chromeos/chromeos.gyp:chromeos_unittests', | 396             '../chromeos/chromeos.gyp:chromeos_unittests', | 
| 390             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', | 397             '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', | 
| 391           ] | 398           ] | 
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 788         ['OS=="android" and target_arch != "x64"', { | 795         ['OS=="android" and target_arch != "x64"', { | 
| 789           'dependencies': [ | 796           'dependencies': [ | 
| 790             '../third_party/android_platform/relocation_packer.gyp:android_reloc
     ation_packer_unittests#host' | 797             '../third_party/android_platform/relocation_packer.gyp:android_reloc
     ation_packer_unittests#host' | 
| 791           ], | 798           ], | 
| 792         }], | 799         }], | 
| 793       ], | 800       ], | 
| 794     }, | 801     }, | 
| 795   ] | 802   ] | 
| 796 } | 803 } | 
| 797 | 804 | 
| OLD | NEW | 
|---|