| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'conditions': [ | 10 'conditions': [ |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 'conditions': [ | 61 'conditions': [ |
| 62 ['use_x11==1', { | 62 ['use_x11==1', { |
| 63 'dependencies': [ | 63 'dependencies': [ |
| 64 '../build/linux/system.gyp:x11', | 64 '../build/linux/system.gyp:x11', |
| 65 '../build/linux/system.gyp:xext', | 65 '../build/linux/system.gyp:xext', |
| 66 '../build/linux/system.gyp:xfixes', | 66 '../build/linux/system.gyp:xfixes', |
| 67 '../build/linux/system.gyp:xi', | 67 '../build/linux/system.gyp:xi', |
| 68 '../build/linux/system.gyp:xrandr', | 68 '../build/linux/system.gyp:xrandr', |
| 69 '../build/linux/system.gyp:xtst', | 69 '../build/linux/system.gyp:xtst', |
| 70 ], | 70 ], |
| 71 }, { |
| 72 'sources!' : [ |
| 73 'host/linux/unicode_to_keysym.cc', |
| 74 ], |
| 71 }], | 75 }], |
| 72 ['chromeos==0 and use_ozone==0', { | 76 ['chromeos==0 and use_ozone==0', { |
| 73 'dependencies': [ | 77 'dependencies': [ |
| 74 # use GTK on Linux, even for Aura builds. | 78 # use GTK on Linux, even for Aura builds. |
| 75 '../build/linux/system.gyp:gtk2', | 79 '../build/linux/system.gyp:gtk2', |
| 76 ], | 80 ], |
| 77 }] | 81 }] |
| 78 ], | 82 ], |
| 79 }], | 83 }], |
| 80 ['chromeos==1', { | 84 ['chromeos==1', { |
| (...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 # Dummy target for chromeos==1 | 729 # Dummy target for chromeos==1 |
| 726 'target_name': 'remoting_it2me_native_messaging_host', | 730 'target_name': 'remoting_it2me_native_messaging_host', |
| 727 'type': 'executable', | 731 'type': 'executable', |
| 728 }, | 732 }, |
| 729 ], # targets | 733 ], # targets |
| 730 }], # end of chromeos==0 | 734 }], # end of chromeos==0 |
| 731 ], # end of conditions | 735 ], # end of conditions |
| 732 }], # end of OS!="win" and enable_remoting_host==1 | 736 }], # end of OS!="win" and enable_remoting_host==1 |
| 733 ], # end of 'conditions' | 737 ], # end of 'conditions' |
| 734 } | 738 } |
| OLD | NEW |