| 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 three targets that we are using to | 5 # This file defines three targets that we are using to |
| 6 # track the progress of the GYP->GN migration: | 6 # track the progress of the GYP->GN migration: |
| 7 # | 7 # |
| 8 # If you run 'ninja gn_build gyp_remaining gyp_groups', and then | 8 # If you run 'ninja gn_build gyp_remaining gyp_groups', and then |
| 9 # run 'ninja', the second ninja invocation should do nothing. This | 9 # run 'ninja', the second ninja invocation should do nothing. This |
| 10 # indicates that everything built by a ninja build is in fact | 10 # indicates that everything built by a ninja build is in fact |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 '../remoting/remoting.gyp:remoting_me2me_native_messaging_host', | 248 '../remoting/remoting.gyp:remoting_me2me_native_messaging_host', |
| 249 '../remoting/remoting.gyp:remoting_me2me_host', | 249 '../remoting/remoting.gyp:remoting_me2me_host', |
| 250 '../remoting/remoting.gyp:remoting_native_messaging_manifests', | 250 '../remoting/remoting.gyp:remoting_native_messaging_manifests', |
| 251 '../remoting/remoting.gyp:remoting_perftests', | 251 '../remoting/remoting.gyp:remoting_perftests', |
| 252 '../remoting/remoting.gyp:remoting_start_host', | 252 '../remoting/remoting.gyp:remoting_start_host', |
| 253 '../remoting/remoting.gyp:remoting_unittests', | 253 '../remoting/remoting.gyp:remoting_unittests', |
| 254 ], | 254 ], |
| 255 }], | 255 }], |
| 256 ['use_x11==1', { | 256 ['use_x11==1', { |
| 257 'dependencies': [ | 257 'dependencies': [ |
| 258 '../media/media.gyp:player_x11', | |
| 259 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 258 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 260 ], | 259 ], |
| 261 'conditions': [ | 260 'conditions': [ |
| 262 ['target_arch!="arm"', { | 261 ['target_arch!="arm"', { |
| 263 'dependencies': [ | 262 'dependencies': [ |
| 264 '../gpu/tools/tools.gyp:compositor_model_bench', | 263 '../gpu/tools/tools.gyp:compositor_model_bench', |
| 265 ], | 264 ], |
| 266 }], | 265 }], |
| 267 ], | 266 ], |
| 268 }], | 267 }], |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 'chromium_builder_perf', | 550 'chromium_builder_perf', |
| 552 'chromium_builder_tests', | 551 'chromium_builder_tests', |
| 553 'chromium_builder_webrtc', | 552 'chromium_builder_webrtc', |
| 554 'chromium_gpu_builder', | 553 'chromium_gpu_builder', |
| 555 'chromium_gpu_debug_builder', | 554 'chromium_gpu_debug_builder', |
| 556 ], | 555 ], |
| 557 }, | 556 }, |
| 558 ] | 557 ] |
| 559 } | 558 } |
| 560 | 559 |
| OLD | NEW |