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

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

Issue 198333004: Move ui.gyp into ui/base/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASED Created 6 years, 9 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 | « ui/compositor/compositor.gyp ('k') | 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 25 matching lines...) Expand all
36 'target_name': 'keyboard', 36 'target_name': 'keyboard',
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 '../base/ui_base.gyp:ui_base',
46 '../compositor/compositor.gyp:compositor', 47 '../compositor/compositor.gyp:compositor',
47 '../events/events.gyp:events', 48 '../events/events.gyp:events',
48 '../gfx/gfx.gyp:gfx', 49 '../gfx/gfx.gyp:gfx',
49 '../gfx/gfx.gyp:gfx_geometry', 50 '../gfx/gfx.gyp:gfx_geometry',
50 '../ui.gyp:ui',
51 '../wm/wm.gyp:wm_public', 51 '../wm/wm.gyp:wm_public',
52 'keyboard_resources', 52 'keyboard_resources',
53 ], 53 ],
54 'defines': [ 54 'defines': [
55 'KEYBOARD_IMPLEMENTATION', 55 'KEYBOARD_IMPLEMENTATION',
56 ], 56 ],
57 'sources': [ 57 'sources': [
58 'keyboard.cc', 58 'keyboard.cc',
59 'keyboard.h', 59 'keyboard.h',
60 'keyboard_constants.cc', 60 'keyboard_constants.cc',
(...skipping 19 matching lines...) Expand all
80 'type': '<(gtest_target_type)', 80 'type': '<(gtest_target_type)',
81 'dependencies': [ 81 'dependencies': [
82 '../../base/base.gyp:base', 82 '../../base/base.gyp:base',
83 '../../base/base.gyp:test_support_base', 83 '../../base/base.gyp:test_support_base',
84 '../../content/content.gyp:content', 84 '../../content/content.gyp:content',
85 '../../skia/skia.gyp:skia', 85 '../../skia/skia.gyp:skia',
86 '../../testing/gtest.gyp:gtest', 86 '../../testing/gtest.gyp:gtest',
87 '../../url/url.gyp:url_lib', 87 '../../url/url.gyp:url_lib',
88 '../aura/aura.gyp:aura', 88 '../aura/aura.gyp:aura',
89 '../aura/aura.gyp:aura_test_support', 89 '../aura/aura.gyp:aura_test_support',
90 '../base/ui_base.gyp:ui_base',
90 '../compositor/compositor.gyp:compositor', 91 '../compositor/compositor.gyp:compositor',
91 '../compositor/compositor.gyp:compositor_test_support', 92 '../compositor/compositor.gyp:compositor_test_support',
92 '../gfx/gfx.gyp:gfx', 93 '../gfx/gfx.gyp:gfx',
93 '../gfx/gfx.gyp:gfx_geometry', 94 '../gfx/gfx.gyp:gfx_geometry',
94 '../resources/ui_resources.gyp:ui_test_pak', 95 '../resources/ui_resources.gyp:ui_test_pak',
95 '../ui.gyp:ui',
96 'keyboard', 96 'keyboard',
97 ], 97 ],
98 'sources': [ 98 'sources': [
99 'test/run_all_unittests.cc', 99 'test/run_all_unittests.cc',
100 'keyboard_controller_unittest.cc', 100 'keyboard_controller_unittest.cc',
101 ], 101 ],
102 'conditions': [ 102 'conditions': [
103 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 103 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
104 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { 104 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
105 'dependencies': [ 105 'dependencies': [
106 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 106 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
107 ], 107 ],
108 'link_settings': { 108 'link_settings': {
109 'ldflags': ['-rdynamic'], 109 'ldflags': ['-rdynamic'],
110 }, 110 },
111 }], 111 }],
112 ['OS=="win" and win_use_allocator_shim==1', { 112 ['OS=="win" and win_use_allocator_shim==1', {
113 'dependencies': [ 113 'dependencies': [
114 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 114 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
115 ], 115 ],
116 }], 116 }],
117 ], 117 ],
118 }, 118 },
119 ], 119 ],
120 } 120 }
OLDNEW
« no previous file with comments | « ui/compositor/compositor.gyp ('k') | ui/message_center/message_center.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698