| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'remoting_enable.gypi', | 7 'remoting_enable.gypi', |
| 8 ], | 8 ], |
| 9 | 9 |
| 10 'targets': [ | 10 'targets': [ |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 ], | 53 ], |
| 54 }], | 54 }], |
| 55 ['enable_me2me_host==1', { | 55 ['enable_me2me_host==1', { |
| 56 'dependencies': [ | 56 'dependencies': [ |
| 57 '../remoting/remoting.gyp:remoting_me2me_host', | 57 '../remoting/remoting.gyp:remoting_me2me_host', |
| 58 '../remoting/remoting.gyp:remoting_me2me_host_archive', | 58 '../remoting/remoting.gyp:remoting_me2me_host_archive', |
| 59 '../remoting/remoting.gyp:remoting_me2me_host_static', | 59 '../remoting/remoting.gyp:remoting_me2me_host_static', |
| 60 '../remoting/remoting.gyp:remoting_me2me_native_messaging_host', | 60 '../remoting/remoting.gyp:remoting_me2me_native_messaging_host', |
| 61 ], | 61 ], |
| 62 }], | 62 }], |
| 63 # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. | |
| 64 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 63 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 65 'dependencies': [ | 64 'dependencies': [ |
| 66 '../remoting/remoting.gyp:remoting_key_tester', | 65 '../remoting/remoting.gyp:remoting_key_tester', |
| 67 '../remoting/remoting.gyp:remoting_webapp_browser_test', | 66 '../remoting/remoting.gyp:remoting_webapp_browser_test', |
| 68 ], | 67 ], |
| 69 }], | 68 }], |
| 70 ], | 69 ], |
| 71 | 70 |
| 72 }, # end of target 'remoting_all' | 71 }, # end of target 'remoting_all' |
| 73 ], # end of targets | 72 ], # end of targets |
| 74 } | 73 } |
| OLD | NEW |