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

Side by Side Diff: trunk/src/ui/keyboard/keyboard.gyp

Issue 25161002: Revert 225857 "gfx: Create a separate gfx component out of ui." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ui/gl/gl.gyp ('k') | trunk/src/ui/message_center/message_center.gyp » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 {
(...skipping 26 matching lines...) Expand all
37 'type': '<(component)', 37 'type': '<(component)',
38 'dependencies': [ 38 'dependencies': [
39 '../../base/base.gyp:base', 39 '../../base/base.gyp:base',
40 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 40 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
41 '../../content/content.gyp:content_browser', 41 '../../content/content.gyp:content_browser',
42 '../../ipc/ipc.gyp:ipc', 42 '../../ipc/ipc.gyp:ipc',
43 '../../skia/skia.gyp:skia', 43 '../../skia/skia.gyp:skia',
44 '../../url/url.gyp:url_lib', 44 '../../url/url.gyp:url_lib',
45 '../aura/aura.gyp:aura', 45 '../aura/aura.gyp:aura',
46 '../compositor/compositor.gyp:compositor', 46 '../compositor/compositor.gyp:compositor',
47 '../gfx/gfx.gyp:gfx',
48 '../ui.gyp:ui', 47 '../ui.gyp:ui',
49 'keyboard_resources', 48 'keyboard_resources',
50 ], 49 ],
51 'defines': [ 50 'defines': [
52 'KEYBOARD_IMPLEMENTATION', 51 'KEYBOARD_IMPLEMENTATION',
53 ], 52 ],
54 'sources': [ 53 'sources': [
55 'keyboard.cc', 54 'keyboard.cc',
56 'keyboard.h', 55 'keyboard.h',
57 'keyboard_constants.cc', 56 'keyboard_constants.cc',
(...skipping 19 matching lines...) Expand all
77 'type': '<(gtest_target_type)', 76 'type': '<(gtest_target_type)',
78 'dependencies': [ 77 'dependencies': [
79 '../../base/base.gyp:base', 78 '../../base/base.gyp:base',
80 '../../base/base.gyp:test_support_base', 79 '../../base/base.gyp:test_support_base',
81 '../../content/content.gyp:content', 80 '../../content/content.gyp:content',
82 '../../skia/skia.gyp:skia', 81 '../../skia/skia.gyp:skia',
83 '../../testing/gtest.gyp:gtest', 82 '../../testing/gtest.gyp:gtest',
84 '../aura/aura.gyp:aura', 83 '../aura/aura.gyp:aura',
85 '../aura/aura.gyp:aura_test_support', 84 '../aura/aura.gyp:aura_test_support',
86 '../compositor/compositor.gyp:compositor', 85 '../compositor/compositor.gyp:compositor',
87 '../gfx/gfx.gyp:gfx',
88 '../ui.gyp:run_ui_unittests', 86 '../ui.gyp:run_ui_unittests',
89 '../ui.gyp:ui', 87 '../ui.gyp:ui',
90 'keyboard', 88 'keyboard',
91 ], 89 ],
92 'sources': [ 90 'sources': [
93 'keyboard_controller_unittest.cc', 91 'keyboard_controller_unittest.cc',
94 'keyboard_test_suite.cc', 92 'keyboard_test_suite.cc',
95 ], 93 ],
96 'conditions': [ 94 'conditions': [
97 ['OS=="linux" and linux_use_tcmalloc==1', { 95 ['OS=="linux" and linux_use_tcmalloc==1', {
98 'dependencies': [ 96 'dependencies': [
99 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 97 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
100 ], 98 ],
101 'link_settings': { 99 'link_settings': {
102 'ldflags': ['-rdynamic'], 100 'ldflags': ['-rdynamic'],
103 }, 101 },
104 }], 102 }],
105 ], 103 ],
106 }, 104 },
107 ], 105 ],
108 } 106 }
OLDNEW
« no previous file with comments | « trunk/src/ui/gl/gl.gyp ('k') | trunk/src/ui/message_center/message_center.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698