| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # Override to dynamically link the cras (ChromeOS audio) library. | 8 # Override to dynamically link the cras (ChromeOS audio) library. |
| 9 'use_cras%': 0, | 9 'use_cras%': 0, |
| 10 # Option e.g. for Linux distributions to link pulseaudio directly | 10 # Option e.g. for Linux distributions to link pulseaudio directly |
| (...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 }], | 752 }], |
| 753 ['OS=="linux"', { | 753 ['OS=="linux"', { |
| 754 'conditions': [ | 754 'conditions': [ |
| 755 ['use_x11==1', { | 755 ['use_x11==1', { |
| 756 'dependencies': [ | 756 'dependencies': [ |
| 757 '../build/linux/system.gyp:x11', | 757 '../build/linux/system.gyp:x11', |
| 758 '../build/linux/system.gyp:xdamage', | 758 '../build/linux/system.gyp:xdamage', |
| 759 '../build/linux/system.gyp:xext', | 759 '../build/linux/system.gyp:xext', |
| 760 '../build/linux/system.gyp:xfixes', | 760 '../build/linux/system.gyp:xfixes', |
| 761 '../build/linux/system.gyp:xtst', | 761 '../build/linux/system.gyp:xtst', |
| 762 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', |
| 762 ], | 763 ], |
| 763 }, { # else: use_x11==0 | 764 }, { # else: use_x11==0 |
| 764 'sources!': [ | 765 'sources!': [ |
| 765 'base/user_input_monitor_linux.cc', | 766 'base/user_input_monitor_linux.cc', |
| 766 ], | 767 ], |
| 767 'defines': [ | 768 'defines': [ |
| 768 'DISABLE_USER_INPUT_MONITOR', | 769 'DISABLE_USER_INPUT_MONITOR', |
| 769 ], | 770 ], |
| 770 }], | 771 }], |
| 771 ['use_cras==1', { | 772 ['use_cras==1', { |
| (...skipping 1147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1919 '../build/isolate.gypi', | 1920 '../build/isolate.gypi', |
| 1920 ], | 1921 ], |
| 1921 'sources': [ | 1922 'sources': [ |
| 1922 'media_unittests.isolate', | 1923 'media_unittests.isolate', |
| 1923 ], | 1924 ], |
| 1924 }, | 1925 }, |
| 1925 ], | 1926 ], |
| 1926 }], | 1927 }], |
| 1927 ], | 1928 ], |
| 1928 } | 1929 } |
| OLD | NEW |