Chromium Code Reviews| 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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 'conditions': [ | 172 'conditions': [ |
| 170 ['target_arch!="arm"', { | 173 ['target_arch!="arm"', { |
| 171 'dependencies': [ | 174 'dependencies': [ |
| 172 '../gpu/tools/tools.gyp:compositor_model_bench', | 175 '../gpu/tools/tools.gyp:compositor_model_bench', |
| 173 ], | 176 ], |
| 174 }], | 177 }], |
| 175 ], | 178 ], |
| 176 }], | 179 }], |
| 177 ['OS=="android"', { | 180 ['OS=="android"', { |
| 178 'dependencies': [ | 181 'dependencies': [ |
| 179 '../base/base.gyp:base_junit_tests', | 182 '../base/base.gyp:base_junit_tests', |
|
xhwang
2015/11/05 17:27:17
tip: next time try to keep rebasing in a different
| |
| 180 '../base/base.gyp:base_unittests_apk', | 183 '../base/base.gyp:base_unittests_apk', |
| 181 '../base/base.gyp:chromium_android_linker', | 184 '../base/base.gyp:chromium_android_linker', |
| 182 '../breakpad/breakpad.gyp:breakpad_unittests_deps', | 185 '../breakpad/breakpad.gyp:breakpad_unittests_deps', |
| 183 '../breakpad/breakpad.gyp:symupload#host', | 186 '../breakpad/breakpad.gyp:symupload#host', |
| 184 '../breakpad/breakpad.gyp:microdump_stackwalk#host', | 187 '../breakpad/breakpad.gyp:microdump_stackwalk#host', |
| 185 '../breakpad/breakpad.gyp:minidump_dump#host', | 188 '../breakpad/breakpad.gyp:minidump_dump#host', |
| 186 '../breakpad/breakpad.gyp:minidump_stackwalk#host', | 189 '../breakpad/breakpad.gyp:minidump_stackwalk#host', |
| 187 '../build/android/rezip.gyp:rezip_apk_jar', | 190 '../build/android/rezip.gyp:rezip_apk_jar', |
| 188 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests_apk', | 191 '../cc/blink/cc_blink_tests.gyp:cc_blink_unittests_apk', |
| 189 '../cc/cc_tests.gyp:cc_unittests_apk', | 192 '../cc/cc_tests.gyp:cc_unittests_apk', |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 354 '../chrome/chrome.gyp:performance_browser_tests', | 357 '../chrome/chrome.gyp:performance_browser_tests', |
| 355 '../chrome/chrome.gyp:sync_integration_tests', | 358 '../chrome/chrome.gyp:sync_integration_tests', |
| 356 '../chrome/chrome.gyp:sync_performance_tests', | 359 '../chrome/chrome.gyp:sync_performance_tests', |
| 357 '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler', | 360 '../chrome/tools/profile_reset/jtl_compiler.gyp:jtl_compiler', |
| 358 '../extensions/extensions_tests.gyp:extensions_browsertests', | 361 '../extensions/extensions_tests.gyp:extensions_browsertests', |
| 359 '../extensions/extensions_tests.gyp:extensions_unittests', | 362 '../extensions/extensions_tests.gyp:extensions_unittests', |
| 360 '../gin/gin.gyp:gin_shell', | 363 '../gin/gin.gyp:gin_shell', |
| 361 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_t est', # TODO(GYP) crbug.com/471920 | 364 '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_t est', # TODO(GYP) crbug.com/471920 |
| 362 '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_t est', # TODO(GYP) crbug.com/471903 to make this complete. | 365 '../gpu/khronos_glcts_support/khronos_glcts_test.gyp:khronos_glcts_t est', # TODO(GYP) crbug.com/471903 to make this complete. |
| 363 '../ipc/ipc.gyp:ipc_perftests', | 366 '../ipc/ipc.gyp:ipc_perftests', |
| 364 '../media/media.gyp:ffmpeg_regression_tests', # TODO(GYP) this shou ld be conditional on media_use_ffmpeg | |
| 365 '../mojo/mojo_base.gyp:mojo_common_unittests', | 367 '../mojo/mojo_base.gyp:mojo_common_unittests', |
| 366 '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma', | 368 '../ppapi/tools/ppapi_tools.gyp:pepper_hash_for_uma', |
| 367 '../skia/skia.gyp:filter_fuzz_stub', | 369 '../skia/skia.gyp:filter_fuzz_stub', |
| 368 '../skia/skia.gyp:image_operations_bench', | 370 '../skia/skia.gyp:image_operations_bench', |
| 369 '../sync/tools/sync_tools.gyp:sync_client', | 371 '../sync/tools/sync_tools.gyp:sync_client', |
| 370 '../sync/tools/sync_tools.gyp:sync_listen_notifications', | 372 '../sync/tools/sync_tools.gyp:sync_listen_notifications', |
| 371 '../third_party/codesighs/codesighs.gyp:codesighs', | 373 '../third_party/codesighs/codesighs.gyp:codesighs', |
| 372 '../third_party/codesighs/codesighs.gyp:maptsvdifftool', | 374 '../third_party/codesighs/codesighs.gyp:maptsvdifftool', |
| 373 '../third_party/pdfium/samples/samples.gyp:pdfium_diff', | 375 '../third_party/pdfium/samples/samples.gyp:pdfium_diff', |
| 374 '../third_party/pdfium/samples/samples.gyp:pdfium_test', | 376 '../third_party/pdfium/samples/samples.gyp:pdfium_test', |
| 375 '../tools/gn/gn.gyp:generate_test_gn_data', | 377 '../tools/gn/gn.gyp:generate_test_gn_data', |
| 376 '../tools/gn/gn.gyp:gn', | 378 '../tools/gn/gn.gyp:gn', |
| 377 '../tools/gn/gn.gyp:gn_unittests', | 379 '../tools/gn/gn.gyp:gn_unittests', |
| 378 '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_syste m_cache', | 380 '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_syste m_cache', |
| 379 '../ui/message_center/message_center.gyp:message_center_unittests', | 381 '../ui/message_center/message_center.gyp:message_center_unittests', |
| 380 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 382 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 381 ], | 383 ], |
| 382 }], | 384 }], |
| 385 ['media_use_ffmpeg==1', { | |
| 386 'dependencies': [ | |
| 387 '../media/media.gyp:ffmpeg_regression_tests', | |
| 388 ], | |
| 389 }], | |
| 383 ['OS=="android" or OS=="linux"', { | 390 ['OS=="android" or OS=="linux"', { |
| 384 'dependencies': [ | 391 'dependencies': [ |
| 385 '../net/net.gyp:disk_cache_memory_test', | 392 '../net/net.gyp:disk_cache_memory_test', |
| 386 ], | 393 ], |
| 387 }], | 394 }], |
| 388 ['chromeos==1', { | 395 ['chromeos==1', { |
| 389 'dependencies': [ | 396 'dependencies': [ |
| 390 '../chromeos/chromeos.gyp:chromeos_unittests', | 397 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 391 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', | 398 '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_unittests', |
| 392 ] | 399 ] |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 789 ['OS=="android" and target_arch != "x64"', { | 796 ['OS=="android" and target_arch != "x64"', { |
| 790 'dependencies': [ | 797 'dependencies': [ |
| 791 '../third_party/android_platform/relocation_packer.gyp:android_reloc ation_packer_unittests#host' | 798 '../third_party/android_platform/relocation_packer.gyp:android_reloc ation_packer_unittests#host' |
| 792 ], | 799 ], |
| 793 }], | 800 }], |
| 794 ], | 801 ], |
| 795 }, | 802 }, |
| 796 ] | 803 ] |
| 797 } | 804 } |
| 798 | 805 |
| OLD | NEW |