| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 '../remoting/remoting.gyp:remoting_unittests', | 249 '../remoting/remoting.gyp:remoting_unittests', |
| 250 ], | 250 ], |
| 251 }], | 251 }], |
| 252 ['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', { | 252 ['remoting==1 and disable_nacl==0 and disable_nacl_untrusted==0', { |
| 253 'dependencies': [ | 253 'dependencies': [ |
| 254 '../remoting/remoting.gyp:remoting_key_tester', | 254 '../remoting/remoting.gyp:remoting_key_tester', |
| 255 ], | 255 ], |
| 256 }], | 256 }], |
| 257 ['use_x11==1', { | 257 ['use_x11==1', { |
| 258 'dependencies': [ | 258 'dependencies': [ |
| 259 '../media/media.gyp:player_x11', | |
| 260 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 259 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 261 ], | 260 ], |
| 262 'conditions': [ | 261 'conditions': [ |
| 263 ['target_arch!="arm"', { | 262 ['target_arch!="arm"', { |
| 264 'dependencies': [ | 263 'dependencies': [ |
| 265 '../gpu/tools/tools.gyp:compositor_model_bench', | 264 '../gpu/tools/tools.gyp:compositor_model_bench', |
| 266 ], | 265 ], |
| 267 }], | 266 }], |
| 268 ], | 267 ], |
| 269 }], | 268 }], |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 'chromium_builder_perf', | 663 'chromium_builder_perf', |
| 665 'chromium_builder_tests', | 664 'chromium_builder_tests', |
| 666 'chromium_builder_webrtc', | 665 'chromium_builder_webrtc', |
| 667 'chromium_gpu_builder', | 666 'chromium_gpu_builder', |
| 668 'chromium_gpu_debug_builder', | 667 'chromium_gpu_debug_builder', |
| 669 ], | 668 ], |
| 670 }, | 669 }, |
| 671 ] | 670 ] |
| 672 } | 671 } |
| 673 | 672 |
| OLD | NEW |