| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 { | 5 { |
| 6 'target_defaults': { | 6 'target_defaults': { |
| 7 'conditions': [ | 7 'conditions': [ |
| 8 ['mojo_shell_debug_url != ""', { | 8 ['mojo_shell_debug_url != ""', { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'MOJO_SHELL_DEBUG=1', | 10 'MOJO_SHELL_DEBUG=1', |
| (...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 '../build/linux/system.gyp:dbus', | 509 '../build/linux/system.gyp:dbus', |
| 510 '../dbus/dbus.gyp:dbus', | 510 '../dbus/dbus.gyp:dbus', |
| 511 ], | 511 ], |
| 512 }], | 512 }], |
| 513 ['use_aura==1', { | 513 ['use_aura==1', { |
| 514 'dependencies': [ | 514 'dependencies': [ |
| 515 # These are only necessary as long as we hard code use of ViewManage
r. | 515 # These are only necessary as long as we hard code use of ViewManage
r. |
| 516 '../skia/skia.gyp:skia', | 516 '../skia/skia.gyp:skia', |
| 517 'mojo_shell_client', | 517 'mojo_shell_client', |
| 518 'mojo_view_manager', | 518 'mojo_view_manager', |
| 519 'mojo_view_manager_bindings', |
| 519 ], | 520 ], |
| 520 }], | 521 }], |
| 521 ], | 522 ], |
| 522 }, | 523 }, |
| 523 { | 524 { |
| 524 'target_name': 'mojo_shell_test_support', | 525 'target_name': 'mojo_shell_test_support', |
| 525 'type': 'static_library', | 526 'type': 'static_library', |
| 526 'dependencies': [ | 527 'dependencies': [ |
| 527 '../base/base.gyp:base', | 528 '../base/base.gyp:base', |
| 528 '../base/base.gyp:base_static', | 529 '../base/base.gyp:base_static', |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 815 'mojo_js_unittests.isolate', | 816 'mojo_js_unittests.isolate', |
| 816 ], | 817 ], |
| 817 'sources': [ | 818 'sources': [ |
| 818 'mojo_js_unittests.isolate', | 819 'mojo_js_unittests.isolate', |
| 819 ], | 820 ], |
| 820 }, | 821 }, |
| 821 ], | 822 ], |
| 822 }], | 823 }], |
| 823 ], | 824 ], |
| 824 } | 825 } |
| OLD | NEW |