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

Side by Side Diff: ui/events/keycodes/events_keycodes.gyp

Issue 2239833003: keycodes: Fix non-X11 build when use_xkbcommon=1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « ui/events/keycodes/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 # GN version: //ui/events/keycodes:xkb 11 # GN version: //ui/events/keycodes:xkb
12 'target_name': 'keycodes_xkb', 12 'target_name': 'keycodes_xkb',
13 'type': 'static_library', 13 'type': 'static_library',
14 'dependencies': [ 14 'dependencies': [
15 '<(DEPTH)/base/base.gyp:base', 15 '<(DEPTH)/base/base.gyp:base',
16 '<(DEPTH)/ui/events/events.gyp:dom_keycode_converter', 16 '<(DEPTH)/ui/events/events.gyp:dom_keycode_converter',
17 ], 17 ],
18 'sources': [ 18 'sources': [
19 'keyboard_code_conversion_xkb.cc', 19 'keyboard_code_conversion_xkb.cc',
20 'keyboard_code_conversion_xkb.h', 20 'keyboard_code_conversion_xkb.h',
21 'scoped_xkb.h', 21 'scoped_xkb.h',
22 'xkb_keysym.h', 22 'xkb_keysym.h',
23 ], 23 ],
24 'conditions': [
25 ['use_xkbcommon==1', {
26 'defines': [
27 'USE_XKBCOMMON',
28 ],
29 }],
30 ],
Wez 2016/08/19 01:35:45 GYP builds are no longer supported; no need for th
jbriance 2016/08/19 09:04:36 Ok, I'll upload a new CL
24 }, 31 },
25 ], 32 ],
26 'conditions': [ 33 'conditions': [
27 ['use_x11==1', { 34 ['use_x11==1', {
28 'targets': [ 35 'targets': [
29 { 36 {
30 # GN version: //ui/events/keycodes:x11 37 # GN version: //ui/events/keycodes:x11
31 'target_name': 'keycodes_x11', 38 'target_name': 'keycodes_x11',
32 'type': '<(component)', 39 'type': '<(component)',
33 'dependencies': [ 40 'dependencies': [
(...skipping 11 matching lines...) Expand all
45 'keyboard_code_conversion_x.cc', 52 'keyboard_code_conversion_x.cc',
46 'keyboard_code_conversion_x.h', 53 'keyboard_code_conversion_x.h',
47 'keysym_to_unicode.cc', 54 'keysym_to_unicode.cc',
48 'keysym_to_unicode.h', 55 'keysym_to_unicode.h',
49 ], 56 ],
50 }, 57 },
51 ], 58 ],
52 }], 59 }],
53 ], 60 ],
54 } 61 }
OLDNEW
« no previous file with comments | « ui/events/keycodes/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698