Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: media/media.gyp

Issue 1880313004: Remove X11 deps from //ui/events:events_base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@device_refactor
Patch Set: Fix bad rebase. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/exo/wayland/server.cc ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 }], 763 }],
764 ['OS=="linux"', { 764 ['OS=="linux"', {
765 'conditions': [ 765 'conditions': [
766 ['use_x11==1', { 766 ['use_x11==1', {
767 'dependencies': [ 767 'dependencies': [
768 '../build/linux/system.gyp:x11', 768 '../build/linux/system.gyp:x11',
769 '../build/linux/system.gyp:xdamage', 769 '../build/linux/system.gyp:xdamage',
770 '../build/linux/system.gyp:xext', 770 '../build/linux/system.gyp:xext',
771 '../build/linux/system.gyp:xfixes', 771 '../build/linux/system.gyp:xfixes',
772 '../build/linux/system.gyp:xtst', 772 '../build/linux/system.gyp:xtst',
773 '../ui/events/keycodes/events_keycodes.gyp:keycodes_x11',
773 '../ui/gfx/x/gfx_x11.gyp:gfx_x11', 774 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
774 ], 775 ],
775 }, { # else: use_x11==0 776 }, { # else: use_x11==0
776 'sources!': [ 777 'sources!': [
777 'base/user_input_monitor_linux.cc', 778 'base/user_input_monitor_linux.cc',
778 ], 779 ],
779 'defines': [ 780 'defines': [
780 'DISABLE_USER_INPUT_MONITOR', 781 'DISABLE_USER_INPUT_MONITOR',
781 ], 782 ],
782 }], 783 }],
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
2071 'dependencies': [ 2072 'dependencies': [
2072 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2073 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2073 ], 2074 ],
2074 }], 2075 }],
2075 ], 2076 ],
2076 }, 2077 },
2077 ], 2078 ],
2078 }], 2079 }],
2079 ], 2080 ],
2080 } 2081 }
OLDNEW
« no previous file with comments | « components/exo/wayland/server.cc ('k') | ui/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698