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

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: Maybe GYP actually works now? 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
Index: ui/events/events.gyp
diff --git a/ui/events/events.gyp b/ui/events/events.gyp
index 19abbfd8eabfa026e2935185df989321ec489eab..001df09615ad60aba965a06ef729662970a87a03 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -63,11 +63,7 @@
'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',
- 'x/keysym_to_unicode.cc',
- 'x/keysym_to_unicode.h',
],
'export_dependent_settings': [
'../../ui/gfx/gfx.gyp:gfx',
@@ -75,15 +71,7 @@
'conditions': [
['use_x11==1', {
'dependencies': [
- '../../build/linux/system.gyp:x11',
- '../gfx/x/gfx_x11.gyp:gfx_x11',
- ],
- }],
- ['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_x',
],
}],
],
@@ -162,6 +150,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_x',
'x/events_x.gyp:events_x',
],
}],
@@ -347,6 +336,7 @@
['use_x11==1', {
'dependencies': [
'devices/x11/events_devices_x11.gyp:events_devices_x11',
+ 'keycodes/events_keycodes.gyp:keycodes_x',
],
}],
['use_x11==1 or use_ozone==1', {
« no previous file with comments | « ui/events/event.cc ('k') | ui/events/keycodes/BUILD.gn » ('j') | ui/events/keycodes/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698