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

Unified Diff: ui/events/events.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/keycodes/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 0853890e4ada0b4e914a1f817fff8c347bb6ff5e..0949eb58f6decda926dc5a1989ca1cf0594f9e44 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -63,8 +63,6 @@
'keycodes/keyboard_code_conversion_mac.mm',
'keycodes/keyboard_code_conversion_win.cc',
'keycodes/keyboard_code_conversion_win.h',
- 'keycodes/keyboard_code_conversion_x.cc',
- 'keycodes/keyboard_code_conversion_x.h',
'keycodes/keyboard_codes.h',
'latency_info.cc',
'latency_info.h',
@@ -75,19 +73,7 @@
'conditions': [
['use_x11==1', {
'dependencies': [
- '../../build/linux/system.gyp:x11',
- '../gfx/x/gfx_x11.gyp:gfx_x11',
- ],
- 'sources': [
- 'keycodes/keysym_to_unicode.cc',
- 'keycodes/keysym_to_unicode.h',
- ],
- }],
- ['use_x11==1 or use_xkbcommon==1', {
- 'sources': [
- 'keycodes/keyboard_code_conversion_xkb.cc',
- 'keycodes/keyboard_code_conversion_xkb.h',
- 'keycodes/xkb_keysym.h',
+ 'keycodes/events_keycodes.gyp:keycodes_x11',
],
}],
],
@@ -165,6 +151,7 @@
'../gfx/x/gfx_x11.gyp:gfx_x11',
'devices/events_devices.gyp:events_devices',
'devices/x11/events_devices_x11.gyp:events_devices_x11',
+ 'keycodes/events_keycodes.gyp:keycodes_x11',
'x/events_x.gyp:events_x',
],
}],
@@ -368,6 +355,7 @@
['use_x11==1', {
'dependencies': [
'devices/x11/events_devices_x11.gyp:events_devices_x11',
+ 'keycodes/events_keycodes.gyp:keycodes_x11',
],
}],
['use_x11==1 or use_ozone==1', {
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/keycodes/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698