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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 }], | 274 }], |
275 ['use_ozone==1', { | 275 ['use_ozone==1', { |
276 'dependencies': [ | 276 'dependencies': [ |
277 '../ui/ozone/ozone.gyp:ozone', | 277 '../ui/ozone/ozone.gyp:ozone', |
278 ], | 278 ], |
279 }], | 279 }], |
280 | 280 |
281 | 281 |
282 ['use_x11==1', { | 282 ['use_x11==1', { |
283 'dependencies': [ | 283 'dependencies': [ |
| 284 '../media/media.gyp:player_x11', |
284 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 285 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
285 ], | 286 ], |
286 'conditions': [ | 287 'conditions': [ |
287 ['target_arch!="arm"', { | 288 ['target_arch!="arm"', { |
288 'dependencies': [ | 289 'dependencies': [ |
289 '../gpu/tools/tools.gyp:compositor_model_bench', | 290 '../gpu/tools/tools.gyp:compositor_model_bench', |
290 ], | 291 ], |
291 }], | 292 }], |
292 ], | 293 ], |
293 }], | 294 }], |
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 'chromium_builder_nacl_sdk', | 698 'chromium_builder_nacl_sdk', |
698 'chromium_builder_lkgr_drmemory_win', | 699 'chromium_builder_lkgr_drmemory_win', |
699 'chromium_builder_dbg_tsan_win', | 700 'chromium_builder_dbg_tsan_win', |
700 ], | 701 ], |
701 }], | 702 }], |
702 ], | 703 ], |
703 }, | 704 }, |
704 ] | 705 ] |
705 } | 706 } |
706 | 707 |
OLD | NEW |