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

Side by Side Diff: ui/base/ui_base.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/aura/aura.gyp ('k') | ui/compositor/compositor.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'target_name': 'ui', 11 'target_name': 'ui_base',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../base/base.gyp:base', 14 '../../base/base.gyp:base',
15 '../base/base.gyp:base_i18n', 15 '../../base/base.gyp:base_i18n',
16 '../base/base.gyp:base_static', 16 '../../base/base.gyp:base_static',
17 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 17 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
18 '../net/net.gyp:net', 18 '../../net/net.gyp:net',
19 '../skia/skia.gyp:skia', 19 '../../skia/skia.gyp:skia',
20 '../third_party/icu/icu.gyp:icui18n', 20 '../../third_party/icu/icu.gyp:icui18n',
21 '../third_party/icu/icu.gyp:icuuc', 21 '../../third_party/icu/icu.gyp:icuuc',
22 '../url/url.gyp:url_lib', 22 '../../url/url.gyp:url_lib',
23 'base/strings/ui_strings.gyp:ui_strings', 23 '../events/events.gyp:events_base',
24 'events/events.gyp:events_base', 24 '../gfx/gfx.gyp:gfx',
25 'gfx/gfx.gyp:gfx', 25 '../gfx/gfx.gyp:gfx_geometry',
26 'gfx/gfx.gyp:gfx_geometry', 26 '../resources/ui_resources.gyp:ui_resources',
27 'resources/ui_resources.gyp:ui_resources', 27 'strings/ui_strings.gyp:ui_strings',
28 ], 28 ],
29 'defines': [ 29 'defines': [
30 'UI_BASE_IMPLEMENTATION', 30 'UI_BASE_IMPLEMENTATION',
31 ], 31 ],
32 'export_dependent_settings': [ 32 'export_dependent_settings': [
33 '../net/net.gyp:net', 33 '../../net/net.gyp:net',
34 'gfx/gfx.gyp:gfx', 34 '../gfx/gfx.gyp:gfx',
35 ], 35 ],
36 'sources' : [ 36 'sources' : [
37 'base/accelerators/accelerator.cc', 37 'accelerators/accelerator.cc',
38 'base/accelerators/accelerator.h', 38 'accelerators/accelerator.h',
39 'base/accelerators/accelerator_manager.cc', 39 'accelerators/accelerator_manager.cc',
40 'base/accelerators/accelerator_manager.h', 40 'accelerators/accelerator_manager.h',
41 'base/accelerators/menu_label_accelerator_util_linux.cc', 41 'accelerators/menu_label_accelerator_util_linux.cc',
42 'base/accelerators/menu_label_accelerator_util_linux.h', 42 'accelerators/menu_label_accelerator_util_linux.h',
43 'base/accelerators/platform_accelerator.h', 43 'accelerators/platform_accelerator.h',
44 'base/accelerators/platform_accelerator_cocoa.h', 44 'accelerators/platform_accelerator_cocoa.h',
45 'base/accelerators/platform_accelerator_cocoa.mm', 45 'accelerators/platform_accelerator_cocoa.mm',
46 'base/accelerators/platform_accelerator_gtk.cc', 46 'accelerators/platform_accelerator_gtk.cc',
47 'base/accelerators/platform_accelerator_gtk.h', 47 'accelerators/platform_accelerator_gtk.h',
48 'base/android/ui_base_jni_registrar.cc', 48 'android/ui_base_jni_registrar.cc',
49 'base/android/ui_base_jni_registrar.h', 49 'android/ui_base_jni_registrar.h',
50 'base/android/view_android.cc', 50 'android/view_android.cc',
51 'base/android/view_android.h', 51 'android/view_android.h',
52 'base/android/window_android.cc', 52 'android/window_android.cc',
53 'base/android/window_android.h', 53 'android/window_android.h',
54 'base/android/window_android_observer.h', 54 'android/window_android_observer.h',
55 'base/base_window.cc', 55 'base_window.cc',
56 'base/base_window.h', 56 'base_window.h',
57 'base/clipboard/clipboard.cc', 57 'clipboard/clipboard.cc',
58 'base/clipboard/clipboard.h', 58 'clipboard/clipboard.h',
59 'base/clipboard/clipboard_android.cc', 59 'clipboard/clipboard_android.cc',
60 'base/clipboard/clipboard_android_initialization.h', 60 'clipboard/clipboard_android_initialization.h',
61 'base/clipboard/clipboard_aura.cc', 61 'clipboard/clipboard_aura.cc',
62 'base/clipboard/clipboard_aurax11.cc', 62 'clipboard/clipboard_aurax11.cc',
63 'base/clipboard/clipboard_constants.cc', 63 'clipboard/clipboard_constants.cc',
64 'base/clipboard/clipboard_gtk.cc', 64 'clipboard/clipboard_gtk.cc',
65 'base/clipboard/clipboard_mac.mm', 65 'clipboard/clipboard_mac.mm',
66 'base/clipboard/clipboard_types.h', 66 'clipboard/clipboard_types.h',
67 'base/clipboard/clipboard_util_win.cc', 67 'clipboard/clipboard_util_win.cc',
68 'base/clipboard/clipboard_util_win.h', 68 'clipboard/clipboard_util_win.h',
69 'base/clipboard/clipboard_win.cc', 69 'clipboard/clipboard_win.cc',
70 'base/clipboard/custom_data_helper.cc', 70 'clipboard/custom_data_helper.cc',
71 'base/clipboard/custom_data_helper.h', 71 'clipboard/custom_data_helper.h',
72 'base/clipboard/custom_data_helper_linux.cc', 72 'clipboard/custom_data_helper_linux.cc',
73 'base/clipboard/custom_data_helper_mac.mm', 73 'clipboard/custom_data_helper_mac.mm',
74 'base/clipboard/scoped_clipboard_writer.cc', 74 'clipboard/scoped_clipboard_writer.cc',
75 'base/clipboard/scoped_clipboard_writer.h', 75 'clipboard/scoped_clipboard_writer.h',
76 'base/cocoa/animation_utils.h', 76 'cocoa/animation_utils.h',
77 'base/cocoa/appkit_utils.h', 77 'cocoa/appkit_utils.h',
78 'base/cocoa/appkit_utils.mm', 78 'cocoa/appkit_utils.mm',
79 'base/cocoa/base_view.h', 79 'cocoa/base_view.h',
80 'base/cocoa/base_view.mm', 80 'cocoa/base_view.mm',
81 'base/cocoa/cocoa_base_utils.h', 81 'cocoa/cocoa_base_utils.h',
82 'base/cocoa/cocoa_base_utils.mm', 82 'cocoa/cocoa_base_utils.mm',
83 'base/cocoa/controls/blue_label_button.h', 83 'cocoa/controls/blue_label_button.h',
84 'base/cocoa/controls/blue_label_button.mm', 84 'cocoa/controls/blue_label_button.mm',
85 'base/cocoa/controls/hover_image_menu_button.h', 85 'cocoa/controls/hover_image_menu_button.h',
86 'base/cocoa/controls/hover_image_menu_button.mm', 86 'cocoa/controls/hover_image_menu_button.mm',
87 'base/cocoa/controls/hover_image_menu_button_cell.h', 87 'cocoa/controls/hover_image_menu_button_cell.h',
88 'base/cocoa/controls/hover_image_menu_button_cell.mm', 88 'cocoa/controls/hover_image_menu_button_cell.mm',
89 'base/cocoa/controls/hyperlink_button_cell.h', 89 'cocoa/controls/hyperlink_button_cell.h',
90 'base/cocoa/controls/hyperlink_button_cell.mm', 90 'cocoa/controls/hyperlink_button_cell.mm',
91 'base/cocoa/find_pasteboard.h', 91 'cocoa/find_pasteboard.h',
92 'base/cocoa/find_pasteboard.mm', 92 'cocoa/find_pasteboard.mm',
93 'base/cocoa/flipped_view.h', 93 'cocoa/flipped_view.h',
94 'base/cocoa/flipped_view.mm', 94 'cocoa/flipped_view.mm',
95 'base/cocoa/focus_tracker.h', 95 'cocoa/focus_tracker.h',
96 'base/cocoa/focus_tracker.mm', 96 'cocoa/focus_tracker.mm',
97 'base/cocoa/focus_window_set.h', 97 'cocoa/focus_window_set.h',
98 'base/cocoa/focus_window_set.mm', 98 'cocoa/focus_window_set.mm',
99 'base/cocoa/fullscreen_window_manager.h', 99 'cocoa/fullscreen_window_manager.h',
100 'base/cocoa/fullscreen_window_manager.mm', 100 'cocoa/fullscreen_window_manager.mm',
101 'base/cocoa/hover_button.h', 101 'cocoa/hover_button.h',
102 'base/cocoa/hover_button.mm', 102 'cocoa/hover_button.mm',
103 'base/cocoa/hover_image_button.h', 103 'cocoa/hover_image_button.h',
104 'base/cocoa/hover_image_button.mm', 104 'cocoa/hover_image_button.mm',
105 'base/cocoa/menu_controller.h', 105 'cocoa/menu_controller.h',
106 'base/cocoa/menu_controller.mm', 106 'cocoa/menu_controller.mm',
107 'base/cocoa/nib_loading.h', 107 'cocoa/nib_loading.h',
108 'base/cocoa/nib_loading.mm', 108 'cocoa/nib_loading.mm',
109 'base/cocoa/nsgraphics_context_additions.h', 109 'cocoa/nsgraphics_context_additions.h',
110 'base/cocoa/nsgraphics_context_additions.mm', 110 'cocoa/nsgraphics_context_additions.mm',
111 'base/cocoa/tracking_area.h', 111 'cocoa/tracking_area.h',
112 'base/cocoa/tracking_area.mm', 112 'cocoa/tracking_area.mm',
113 'base/cocoa/underlay_opengl_hosting_window.h', 113 'cocoa/underlay_opengl_hosting_window.h',
114 'base/cocoa/underlay_opengl_hosting_window.mm', 114 'cocoa/underlay_opengl_hosting_window.mm',
115 'base/cocoa/view_description.h', 115 'cocoa/view_description.h',
116 'base/cocoa/view_description.mm', 116 'cocoa/view_description.mm',
117 'base/cocoa/window_size_constants.h', 117 'cocoa/window_size_constants.h',
118 'base/cocoa/window_size_constants.mm', 118 'cocoa/window_size_constants.mm',
119 'base/cursor/cursor.cc', 119 'cursor/cursor.cc',
120 'base/cursor/cursor.h', 120 'cursor/cursor.h',
121 'base/cursor/cursor_android.cc', 121 'cursor/cursor_android.cc',
122 'base/cursor/cursor_loader.h', 122 'cursor/cursor_loader.h',
123 'base/cursor/cursor_loader_ozone.cc', 123 'cursor/cursor_loader_ozone.cc',
124 'base/cursor/cursor_loader_ozone.h', 124 'cursor/cursor_loader_ozone.h',
125 'base/cursor/cursor_loader_win.cc', 125 'cursor/cursor_loader_win.cc',
126 'base/cursor/cursor_loader_win.h', 126 'cursor/cursor_loader_win.h',
127 'base/cursor/cursor_loader_x11.cc', 127 'cursor/cursor_loader_x11.cc',
128 'base/cursor/cursor_loader_x11.h', 128 'cursor/cursor_loader_x11.h',
129 'base/cursor/cursor_ozone.cc', 129 'cursor/cursor_ozone.cc',
130 'base/cursor/cursor_mac.mm', 130 'cursor/cursor_mac.mm',
131 'base/cursor/cursor_win.cc', 131 'cursor/cursor_win.cc',
132 'base/cursor/cursor_x11.cc', 132 'cursor/cursor_x11.cc',
133 'base/cursor/cursors_aura.cc', 133 'cursor/cursors_aura.cc',
134 'base/cursor/cursors_aura.h', 134 'cursor/cursors_aura.h',
135 'base/cursor/ozone/cursor_factory_ozone.cc', 135 'cursor/ozone/cursor_factory_ozone.cc',
136 'base/cursor/ozone/cursor_factory_ozone.h', 136 'cursor/ozone/cursor_factory_ozone.h',
137 'base/default_theme_provider.cc', 137 'default_theme_provider.cc',
138 'base/default_theme_provider.h', 138 'default_theme_provider.h',
139 'base/default_theme_provider_mac.mm', 139 'default_theme_provider_mac.mm',
140 'base/device_form_factor_android.cc', 140 'device_form_factor_android.cc',
141 'base/device_form_factor_desktop.cc', 141 'device_form_factor_desktop.cc',
142 'base/device_form_factor_ios.mm', 142 'device_form_factor_ios.mm',
143 'base/device_form_factor.h', 143 'device_form_factor.h',
144 'base/dragdrop/cocoa_dnd_util.h', 144 'dragdrop/cocoa_dnd_util.h',
145 'base/dragdrop/cocoa_dnd_util.mm', 145 'dragdrop/cocoa_dnd_util.mm',
146 'base/dragdrop/drag_drop_types.h', 146 'dragdrop/drag_drop_types.h',
147 'base/dragdrop/drag_drop_types_win.cc', 147 'dragdrop/drag_drop_types_win.cc',
148 'base/dragdrop/drag_source_win.cc', 148 'dragdrop/drag_source_win.cc',
149 'base/dragdrop/drag_source_win.h', 149 'dragdrop/drag_source_win.h',
150 'base/dragdrop/drag_utils.cc', 150 'dragdrop/drag_utils.cc',
151 'base/dragdrop/drag_utils.h', 151 'dragdrop/drag_utils.h',
152 'base/dragdrop/drag_utils_aura.cc', 152 'dragdrop/drag_utils_aura.cc',
153 'base/dragdrop/drag_utils_win.cc', 153 'dragdrop/drag_utils_win.cc',
154 'base/dragdrop/drop_target_event.cc', 154 'dragdrop/drop_target_event.cc',
155 'base/dragdrop/drop_target_event.h', 155 'dragdrop/drop_target_event.h',
156 'base/dragdrop/drop_target_win.cc', 156 'dragdrop/drop_target_win.cc',
157 'base/dragdrop/drop_target_win.h', 157 'dragdrop/drop_target_win.h',
158 'base/dragdrop/gtk_dnd_util.cc', 158 'dragdrop/gtk_dnd_util.cc',
159 'base/dragdrop/gtk_dnd_util.h', 159 'dragdrop/gtk_dnd_util.h',
160 'base/dragdrop/os_exchange_data.cc', 160 'dragdrop/os_exchange_data.cc',
161 'base/dragdrop/os_exchange_data.h', 161 'dragdrop/os_exchange_data.h',
162 'base/dragdrop/os_exchange_data_provider_aura.cc', 162 'dragdrop/os_exchange_data_provider_aura.cc',
163 'base/dragdrop/os_exchange_data_provider_aura.h', 163 'dragdrop/os_exchange_data_provider_aura.h',
164 'base/dragdrop/os_exchange_data_provider_aurax11.cc', 164 'dragdrop/os_exchange_data_provider_aurax11.cc',
165 'base/dragdrop/os_exchange_data_provider_aurax11.h', 165 'dragdrop/os_exchange_data_provider_aurax11.h',
166 'base/dragdrop/os_exchange_data_provider_win.cc', 166 'dragdrop/os_exchange_data_provider_win.cc',
167 'base/dragdrop/os_exchange_data_provider_win.h', 167 'dragdrop/os_exchange_data_provider_win.h',
168 'base/gtk/event_synthesis_gtk.cc', 168 'gtk/event_synthesis_gtk.cc',
169 'base/gtk/event_synthesis_gtk.h', 169 'gtk/event_synthesis_gtk.h',
170 'base/gtk/focus_store_gtk.cc', 170 'gtk/focus_store_gtk.cc',
171 'base/gtk/focus_store_gtk.h', 171 'gtk/focus_store_gtk.h',
172 'base/gtk/g_object_destructor_filo.cc', 172 'gtk/g_object_destructor_filo.cc',
173 'base/gtk/g_object_destructor_filo.h', 173 'gtk/g_object_destructor_filo.h',
174 'base/gtk/gtk_expanded_container.cc', 174 'gtk/gtk_expanded_container.cc',
175 'base/gtk/gtk_expanded_container.h', 175 'gtk/gtk_expanded_container.h',
176 'base/gtk/gtk_floating_container.cc', 176 'gtk/gtk_floating_container.cc',
177 'base/gtk/gtk_floating_container.h', 177 'gtk/gtk_floating_container.h',
178 'base/gtk/gtk_hig_constants.h', 178 'gtk/gtk_hig_constants.h',
179 'base/gtk/gtk_screen_util.cc', 179 'gtk/gtk_screen_util.cc',
180 'base/gtk/gtk_screen_util.h', 180 'gtk/gtk_screen_util.h',
181 'base/gtk/gtk_signal.h', 181 'gtk/gtk_signal.h',
182 'base/gtk/gtk_signal_registrar.cc', 182 'gtk/gtk_signal_registrar.cc',
183 'base/gtk/gtk_signal_registrar.h', 183 'gtk/gtk_signal_registrar.h',
184 'base/gtk/gtk_windowing.cc', 184 'gtk/gtk_windowing.cc',
185 'base/gtk/gtk_windowing.h', 185 'gtk/gtk_windowing.h',
186 'base/gtk/owned_widget_gtk.cc', 186 'gtk/owned_widget_gtk.cc',
187 'base/gtk/owned_widget_gtk.h', 187 'gtk/owned_widget_gtk.h',
188 'base/gtk/scoped_region.cc', 188 'gtk/scoped_region.cc',
189 'base/gtk/scoped_region.h', 189 'gtk/scoped_region.h',
190 'base/hit_test.h', 190 'hit_test.h',
191 'base/l10n/formatter.cc', 191 'l10n/formatter.cc',
192 'base/l10n/formatter.h', 192 'l10n/formatter.h',
193 'base/l10n/l10n_font_util.cc', 193 'l10n/l10n_font_util.cc',
194 'base/l10n/l10n_font_util.h', 194 'l10n/l10n_font_util.h',
195 'base/l10n/l10n_util.cc', 195 'l10n/l10n_util.cc',
196 'base/l10n/l10n_util.h', 196 'l10n/l10n_util.h',
197 'base/l10n/l10n_util_android.cc', 197 'l10n/l10n_util_android.cc',
198 'base/l10n/l10n_util_android.h', 198 'l10n/l10n_util_android.h',
199 'base/l10n/l10n_util_collator.h', 199 'l10n/l10n_util_collator.h',
200 'base/l10n/l10n_util_mac.h', 200 'l10n/l10n_util_mac.h',
201 'base/l10n/l10n_util_mac.mm', 201 'l10n/l10n_util_mac.mm',
202 'base/l10n/l10n_util_plurals.cc', 202 'l10n/l10n_util_plurals.cc',
203 'base/l10n/l10n_util_plurals.h', 203 'l10n/l10n_util_plurals.h',
204 'base/l10n/l10n_util_posix.cc', 204 'l10n/l10n_util_posix.cc',
205 'base/l10n/l10n_util_win.cc', 205 'l10n/l10n_util_win.cc',
206 'base/l10n/l10n_util_win.h', 206 'l10n/l10n_util_win.h',
207 'base/l10n/time_format.cc', 207 'l10n/time_format.cc',
208 'base/l10n/time_format.h', 208 'l10n/time_format.h',
209 'base/layout.cc', 209 'layout.cc',
210 'base/layout.h', 210 'layout.h',
211 'base/layout_mac.mm', 211 'layout_mac.mm',
212 'base/models/button_menu_item_model.cc', 212 'models/button_menu_item_model.cc',
213 'base/models/button_menu_item_model.h', 213 'models/button_menu_item_model.h',
214 'base/models/combobox_model.cc', 214 'models/combobox_model.cc',
215 'base/models/combobox_model.h', 215 'models/combobox_model.h',
216 'base/models/combobox_model_observer.h', 216 'models/combobox_model_observer.h',
217 'base/models/dialog_model.cc', 217 'models/dialog_model.cc',
218 'base/models/dialog_model.h', 218 'models/dialog_model.h',
219 'base/models/list_model.h', 219 'models/list_model.h',
220 'base/models/list_model_observer.h', 220 'models/list_model_observer.h',
221 'base/models/list_selection_model.cc', 221 'models/list_selection_model.cc',
222 'base/models/list_selection_model.h', 222 'models/list_selection_model.h',
223 'base/models/menu_model.cc', 223 'models/menu_model.cc',
224 'base/models/menu_model.h', 224 'models/menu_model.h',
225 'base/models/menu_model_delegate.h', 225 'models/menu_model_delegate.h',
226 'base/models/menu_separator_types.h', 226 'models/menu_separator_types.h',
227 'base/models/simple_menu_model.cc', 227 'models/simple_menu_model.cc',
228 'base/models/simple_menu_model.h', 228 'models/simple_menu_model.h',
229 'base/models/table_model.cc', 229 'models/table_model.cc',
230 'base/models/table_model.h', 230 'models/table_model.h',
231 'base/models/table_model_observer.h', 231 'models/table_model_observer.h',
232 'base/models/tree_model.cc', 232 'models/tree_model.cc',
233 'base/models/tree_model.h', 233 'models/tree_model.h',
234 'base/models/tree_node_iterator.h', 234 'models/tree_node_iterator.h',
235 'base/models/tree_node_model.h', 235 'models/tree_node_model.h',
236 'base/nine_image_painter_factory.cc', 236 'nine_image_painter_factory.cc',
237 'base/nine_image_painter_factory.h', 237 'nine_image_painter_factory.h',
238 'base/resource/data_pack.cc', 238 'resource/data_pack.cc',
239 'base/resource/data_pack.h', 239 'resource/data_pack.h',
240 'base/resource/resource_bundle.cc', 240 'resource/resource_bundle.cc',
241 'base/resource/resource_bundle.h', 241 'resource/resource_bundle.h',
242 'base/resource/resource_bundle_android.cc', 242 'resource/resource_bundle_android.cc',
243 'base/resource/resource_bundle_auralinux.cc', 243 'resource/resource_bundle_auralinux.cc',
244 'base/resource/resource_bundle_gtk.cc', 244 'resource/resource_bundle_gtk.cc',
245 'base/resource/resource_bundle_ios.mm', 245 'resource/resource_bundle_ios.mm',
246 'base/resource/resource_bundle_mac.mm', 246 'resource/resource_bundle_mac.mm',
247 'base/resource/resource_bundle_win.cc', 247 'resource/resource_bundle_win.cc',
248 'base/resource/resource_bundle_win.h', 248 'resource/resource_bundle_win.h',
249 'base/resource/resource_data_dll_win.cc', 249 'resource/resource_data_dll_win.cc',
250 'base/resource/resource_data_dll_win.h', 250 'resource/resource_data_dll_win.h',
251 'base/resource/resource_handle.h', 251 'resource/resource_handle.h',
252 'base/text/bytes_formatting.cc', 252 'text/bytes_formatting.cc',
253 'base/text/bytes_formatting.h', 253 'text/bytes_formatting.h',
254 'base/theme_provider.cc', 254 'theme_provider.cc',
255 'base/theme_provider.h', 255 'theme_provider.h',
256 'base/touch/touch_device.cc', 256 'touch/touch_device.cc',
257 'base/touch/touch_device.h', 257 'touch/touch_device.h',
258 'base/touch/touch_device_android.cc', 258 'touch/touch_device_android.cc',
259 'base/touch/touch_device_aurax11.cc', 259 'touch/touch_device_aurax11.cc',
260 'base/touch/touch_device_ozone.cc', 260 'touch/touch_device_ozone.cc',
261 'base/touch/touch_device_win.cc', 261 'touch/touch_device_win.cc',
262 'base/touch/touch_editing_controller.cc', 262 'touch/touch_editing_controller.cc',
263 'base/touch/touch_editing_controller.h', 263 'touch/touch_editing_controller.h',
264 'base/touch/touch_enabled.cc', 264 'touch/touch_enabled.cc',
265 'base/touch/touch_enabled.h', 265 'touch/touch_enabled.h',
266 'base/ui_base_exports.cc', 266 'ui_base_exports.cc',
267 'base/ui_base_paths.cc', 267 'ui_base_paths.cc',
268 'base/ui_base_paths.h', 268 'ui_base_paths.h',
269 'base/ui_base_switches.cc', 269 'ui_base_switches.cc',
270 'base/ui_base_switches.h', 270 'ui_base_switches.h',
271 'base/ui_base_switches_util.cc', 271 'ui_base_switches_util.cc',
272 'base/ui_base_switches_util.h', 272 'ui_base_switches_util.h',
273 'base/ui_base_types.cc', 273 'ui_base_types.cc',
274 'base/ui_base_types.h', 274 'ui_base_types.h',
275 'base/ui_base_export.h', 275 'ui_base_export.h',
276 'base/view_prop.cc', 276 'view_prop.cc',
277 'base/view_prop.h', 277 'view_prop.h',
278 'base/webui/jstemplate_builder.cc', 278 'webui/jstemplate_builder.cc',
279 'base/webui/jstemplate_builder.h', 279 'webui/jstemplate_builder.h',
280 'base/webui/web_ui_util.cc', 280 'webui/web_ui_util.cc',
281 'base/webui/web_ui_util.h', 281 'webui/web_ui_util.h',
282 'base/win/accessibility_ids_win.h', 282 'win/accessibility_ids_win.h',
283 'base/win/accessibility_misc_utils.cc', 283 'win/accessibility_misc_utils.cc',
284 'base/win/accessibility_misc_utils.h', 284 'win/accessibility_misc_utils.h',
285 'base/win/atl_module.h', 285 'win/atl_module.h',
286 'base/win/dpi_setup.cc', 286 'win/dpi_setup.cc',
287 'base/win/dpi_setup.h', 287 'win/dpi_setup.h',
288 'base/win/foreground_helper.cc', 288 'win/foreground_helper.cc',
289 'base/win/foreground_helper.h', 289 'win/foreground_helper.h',
290 'base/win/hidden_window.cc', 290 'win/hidden_window.cc',
291 'base/win/hidden_window.h', 291 'win/hidden_window.h',
292 'base/win/hwnd_subclass.cc', 292 'win/hwnd_subclass.cc',
293 'base/win/hwnd_subclass.h', 293 'win/hwnd_subclass.h',
294 'base/win/lock_state.cc', 294 'win/lock_state.cc',
295 'base/win/lock_state.h', 295 'win/lock_state.h',
296 'base/win/message_box_win.cc', 296 'win/message_box_win.cc',
297 'base/win/message_box_win.h', 297 'win/message_box_win.h',
298 'base/win/mouse_wheel_util.cc', 298 'win/mouse_wheel_util.cc',
299 'base/win/mouse_wheel_util.h', 299 'win/mouse_wheel_util.h',
300 'base/win/scoped_ole_initializer.cc', 300 'win/scoped_ole_initializer.cc',
301 'base/win/scoped_ole_initializer.h', 301 'win/scoped_ole_initializer.h',
302 'base/win/shell.cc', 302 'win/shell.cc',
303 'base/win/shell.h', 303 'win/shell.h',
304 'base/win/touch_input.cc', 304 'win/touch_input.cc',
305 'base/win/touch_input.h', 305 'win/touch_input.h',
306 'base/win/window_event_target.cc', 306 'win/window_event_target.cc',
307 'base/win/window_event_target.h', 307 'win/window_event_target.h',
308 'base/window_open_disposition.cc', 308 'window_open_disposition.cc',
309 'base/window_open_disposition.h', 309 'window_open_disposition.h',
310 'base/work_area_watcher_observer.h', 310 'work_area_watcher_observer.h',
311 'base/x/active_window_watcher_x.cc', 311 'x/active_window_watcher_x.cc',
312 'base/x/active_window_watcher_x.h', 312 'x/active_window_watcher_x.h',
313 'base/x/active_window_watcher_x_observer.h', 313 'x/active_window_watcher_x_observer.h',
314 'base/x/root_window_property_watcher_x.cc', 314 'x/root_window_property_watcher_x.cc',
315 'base/x/root_window_property_watcher_x.h', 315 'x/root_window_property_watcher_x.h',
316 'base/x/selection_owner.cc', 316 'x/selection_owner.cc',
317 'base/x/selection_owner.h', 317 'x/selection_owner.h',
318 'base/x/selection_requestor.cc', 318 'x/selection_requestor.cc',
319 'base/x/selection_requestor.h', 319 'x/selection_requestor.h',
320 'base/x/selection_utils.cc', 320 'x/selection_utils.cc',
321 'base/x/selection_utils.h', 321 'x/selection_utils.h',
322 'base/x/work_area_watcher_x.cc', 322 'x/work_area_watcher_x.cc',
323 'base/x/work_area_watcher_x.h', 323 'x/work_area_watcher_x.h',
324 'base/x/x11_util.cc', 324 'x/x11_util.cc',
325 'base/x/x11_util.h', 325 'x/x11_util.h',
326 'base/x/x11_util_internal.h', 326 'x/x11_util_internal.h',
327 ], 327 ],
328 'target_conditions': [ 328 'target_conditions': [
329 ['OS == "ios"', { 329 ['OS == "ios"', {
330 'sources/': [ 330 'sources/': [
331 ['include', '^base/l10n/l10n_util_mac\\.mm$'], 331 ['include', '^l10n/l10n_util_mac\\.mm$'],
332 ], 332 ],
333 }], 333 }],
334 ], 334 ],
335 'conditions': [ 335 'conditions': [
336 ['OS!="ios"', { 336 ['OS!="ios"', {
337 'includes': [ 337 'includes': [
338 'base/ime/ime.gypi', 338 'ime/ime.gypi',
339 ], 339 ],
340 }, { # OS=="ios" 340 }, { # OS=="ios"
341 # iOS only uses a subset of UI. 341 # iOS only uses a subset of UI.
342 'sources/': [ 342 'sources/': [
343 ['exclude', '\\.(cc|mm)$'], 343 ['exclude', '\\.(cc|mm)$'],
344 ['include', '_ios\\.(cc|mm)$'], 344 ['include', '_ios\\.(cc|mm)$'],
345 ['include', '(^|/)ios/'], 345 ['include', '(^|/)ios/'],
346 ['include', '^base/l10n/'], 346 ['include', '^l10n/'],
347 ['include', '^base/layout'], 347 ['include', '^layout'],
348 ['include', '^base/resource/'], 348 ['include', '^resource/'],
349 ['include', '^base/ui_base_'], 349 ['include', '^ui_base_'],
350 ], 350 ],
351 'link_settings': { 351 'link_settings': {
352 'libraries': [ 352 'libraries': [
353 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework', 353 '$(SDKROOT)/System/Library/Frameworks/CoreGraphics.framework',
354 ], 354 ],
355 }, 355 },
356 }], 356 }],
357 ['toolkit_views==1', { 357 ['toolkit_views==1', {
358 'dependencies': [ 358 'dependencies': [
359 'events/events.gyp:events', 359 '../events/events.gyp:events',
360 ], 360 ],
361 }], 361 }],
362 ['use_aura==1', { 362 ['use_aura==1', {
363 'sources/': [ 363 'sources/': [
364 ['exclude', 'base/clipboard/clipboard_mac.mm'], 364 ['exclude', 'clipboard/clipboard_mac.mm'],
365 ['exclude', 'base/layout_mac.mm'], 365 ['exclude', 'layout_mac.mm'],
366 ['exclude', 'base/work_area_watcher_observer.h'], 366 ['exclude', 'work_area_watcher_observer.h'],
367 ['exclude', 'base/x/active_window_watcher_x.cc'], 367 ['exclude', 'x/active_window_watcher_x.cc'],
368 ['exclude', 'base/x/active_window_watcher_x.h'], 368 ['exclude', 'x/active_window_watcher_x.h'],
369 ['exclude', 'base/x/active_window_watcher_x_observer.h'], 369 ['exclude', 'x/active_window_watcher_x_observer.h'],
370 ['exclude', 'base/x/root_window_property_watcher_x.cc'], 370 ['exclude', 'x/root_window_property_watcher_x.cc'],
371 ['exclude', 'base/x/root_window_property_watcher_x.h'], 371 ['exclude', 'x/root_window_property_watcher_x.h'],
372 ['exclude', 'base/x/work_area_watcher_x.cc'], 372 ['exclude', 'x/work_area_watcher_x.cc'],
373 ['exclude', 'base/x/work_area_watcher_x.h'], 373 ['exclude', 'x/work_area_watcher_x.h'],
374 ], 374 ],
375 'dependencies': [ 375 'dependencies': [
376 'events/events.gyp:events', 376 '../events/events.gyp:events',
377 ], 377 ],
378 }, { # use_aura!=1 378 }, { # use_aura!=1
379 'sources!': [ 379 'sources!': [
380 'base/cursor/cursor.cc', 380 'cursor/cursor.cc',
381 'base/cursor/cursor.h', 381 'cursor/cursor.h',
382 'base/cursor/cursor_loader_x11.cc', 382 'cursor/cursor_loader_x11.cc',
383 'base/cursor/cursor_loader_x11.h', 383 'cursor/cursor_loader_x11.h',
384 'base/cursor/cursor_mac.mm', 384 'cursor/cursor_mac.mm',
385 'base/cursor/cursor_win.cc', 385 'cursor/cursor_win.cc',
386 'base/cursor/cursor_x11.cc', 386 'cursor/cursor_x11.cc',
387 'base/nine_image_painter_factory.cc', 387 'nine_image_painter_factory.cc',
388 'base/nine_image_painter_factory.h', 388 'nine_image_painter_factory.h',
389 'base/x/selection_owner.cc', 389 'x/selection_owner.cc',
390 'base/x/selection_owner.h', 390 'x/selection_owner.h',
391 'base/x/selection_requestor.cc', 391 'x/selection_requestor.cc',
392 'base/x/selection_requestor.h', 392 'x/selection_requestor.h',
393 'base/x/selection_utils.cc', 393 'x/selection_utils.cc',
394 'base/x/selection_utils.h', 394 'x/selection_utils.h',
395 ] 395 ]
396 }], 396 }],
397 ['use_aura==0 or OS!="linux"', { 397 ['use_aura==0 or OS!="linux"', {
398 'sources!': [ 398 'sources!': [
399 'base/resource/resource_bundle_auralinux.cc', 399 'resource/resource_bundle_auralinux.cc',
400 ], 400 ],
401 }], 401 }],
402 ['use_aura==1 and OS=="win"', { 402 ['use_aura==1 and OS=="win"', {
403 'sources/': [ 403 'sources/': [
404 ['exclude', 'base/dragdrop/drag_utils_aura.cc'], 404 ['exclude', 'dragdrop/drag_utils_aura.cc'],
405 ], 405 ],
406 }], 406 }],
407 ['use_glib == 1', { 407 ['use_glib == 1', {
408 'dependencies': [ 408 'dependencies': [
409 # font_gtk.cc uses fontconfig. 409 # font_gtk.cc uses fontconfig.
410 '../build/linux/system.gyp:fontconfig', 410 '../../build/linux/system.gyp:fontconfig',
411 '../build/linux/system.gyp:glib', 411 '../../build/linux/system.gyp:glib',
412 ], 412 ],
413 }], 413 }],
414 ['desktop_linux == 1 or chromeos == 1', { 414 ['desktop_linux == 1 or chromeos == 1', {
415 'conditions': [ 415 'conditions': [
416 ['toolkit_views==0 and use_aura==0', { 416 ['toolkit_views==0 and use_aura==0', {
417 # Note: because of gyp predence rules this has to be defined as 417 # Note: because of gyp predence rules this has to be defined as
418 # 'sources/' rather than 'sources!'. 418 # 'sources/' rather than 'sources!'.
419 'sources/': [ 419 'sources/': [
420 ['exclude', '^base/dragdrop/drag_utils.cc'], 420 ['exclude', '^dragdrop/drag_utils.cc'],
421 ['exclude', '^base/dragdrop/drag_utils.h'], 421 ['exclude', '^dragdrop/drag_utils.h'],
422 ['exclude', '^base/dragdrop/os_exchange_data.cc'], 422 ['exclude', '^dragdrop/os_exchange_data.cc'],
423 ['exclude', '^base/dragdrop/os_exchange_data.h'], 423 ['exclude', '^dragdrop/os_exchange_data.h'],
424 ], 424 ],
425 }, { 425 }, {
426 # Note: because of gyp predence rules this has to be defined as 426 # Note: because of gyp predence rules this has to be defined as
427 # 'sources/' rather than 'sources!'. 427 # 'sources/' rather than 'sources!'.
428 'sources/': [ 428 'sources/': [
429 ['include', '^base/dragdrop/os_exchange_data.cc'], 429 ['include', '^dragdrop/os_exchange_data.cc'],
430 ], 430 ],
431 }], 431 }],
432 ], 432 ],
433 }], 433 }],
434 ['use_pango==1', { 434 ['use_pango==1', {
435 'dependencies': [ 435 'dependencies': [
436 '../build/linux/system.gyp:pangocairo', 436 '../../build/linux/system.gyp:pangocairo',
437 ], 437 ],
438 }], 438 }],
439 ['OS=="win" or use_clipboard_aurax11==1', { 439 ['OS=="win" or use_clipboard_aurax11==1', {
440 'sources!': [ 440 'sources!': [
441 'base/clipboard/clipboard_aura.cc', 441 'clipboard/clipboard_aura.cc',
442 ], 442 ],
443 }, { 443 }, {
444 'sources!': [ 444 'sources!': [
445 'base/clipboard/clipboard_aurax11.cc', 445 'clipboard/clipboard_aurax11.cc',
446 ], 446 ],
447 }], 447 }],
448 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', { 448 ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
449 'sources!': [ 449 'sources!': [
450 'base/dragdrop/os_exchange_data_provider_aurax11.cc', 450 'dragdrop/os_exchange_data_provider_aurax11.cc',
451 'base/touch/touch_device.cc', 451 'touch/touch_device.cc',
452 ], 452 ],
453 }, { 453 }, {
454 'sources!': [ 454 'sources!': [
455 'base/dragdrop/os_exchange_data_provider_aura.cc', 455 'dragdrop/os_exchange_data_provider_aura.cc',
456 'base/dragdrop/os_exchange_data_provider_aura.h', 456 'dragdrop/os_exchange_data_provider_aura.h',
457 'base/touch/touch_device_aurax11.cc', 457 'touch/touch_device_aurax11.cc',
458 ], 458 ],
459 }], 459 }],
460 ['OS=="win"', { 460 ['OS=="win"', {
461 'sources!': [ 461 'sources!': [
462 'base/touch/touch_device.cc', 462 'touch/touch_device.cc',
463 ], 463 ],
464 'include_dirs': [ 464 'include_dirs': [
465 '../', 465 '../..',
466 '../third_party/wtl/include', 466 '../../third_party/wtl/include',
467 ], 467 ],
468 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int 468 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int
469 # C4324 is structure was padded due to __declspec(align()), which is 469 # C4324 is structure was padded due to __declspec(align()), which is
470 # uninteresting. 470 # uninteresting.
471 'msvs_disabled_warnings': [ 4267, 4324 ], 471 'msvs_disabled_warnings': [ 4267, 4324 ],
472 'msvs_settings': { 472 'msvs_settings': {
473 'VCLinkerTool': { 473 'VCLinkerTool': {
474 'DelayLoadDLLs': [ 474 'DelayLoadDLLs': [
475 'd2d1.dll', 475 'd2d1.dll',
476 'd3d10_1.dll', 476 'd3d10_1.dll',
(...skipping 11 matching lines...) Expand all
488 '-limm32.lib', 488 '-limm32.lib',
489 '-ld2d1.lib', 489 '-ld2d1.lib',
490 '-ldwmapi.lib', 490 '-ldwmapi.lib',
491 '-loleacc.lib', 491 '-loleacc.lib',
492 ], 492 ],
493 }, 493 },
494 },{ # OS!="win" 494 },{ # OS!="win"
495 'conditions': [ 495 'conditions': [
496 ['use_aura==0', { 496 ['use_aura==0', {
497 'sources!': [ 497 'sources!': [
498 'base/view_prop.cc', 498 'view_prop.cc',
499 'base/view_prop.h', 499 'view_prop.h',
500 ], 500 ],
501 }], 501 }],
502 ], 502 ],
503 'sources!': [ 503 'sources!': [
504 'base/dragdrop/drag_drop_types.h', 504 'dragdrop/drag_drop_types.h',
505 'base/dragdrop/os_exchange_data.cc', 505 'dragdrop/os_exchange_data.cc',
506 ], 506 ],
507 }], 507 }],
508 ['OS=="mac"', { 508 ['OS=="mac"', {
509 'dependencies': [ 509 'dependencies': [
510 '../third_party/mozilla/mozilla.gyp:mozilla', 510 '../../third_party/mozilla/mozilla.gyp:mozilla',
511 ], 511 ],
512 'sources!': [ 512 'sources!': [
513 'base/dragdrop/drag_utils.cc', 513 'dragdrop/drag_utils.cc',
514 'base/dragdrop/drag_utils.h', 514 'dragdrop/drag_utils.h',
515 ], 515 ],
516 'link_settings': { 516 'link_settings': {
517 'libraries': [ 517 'libraries': [
518 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 518 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
519 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', 519 '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
520 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework', 520 '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
521 ], 521 ],
522 }, 522 },
523 }], 523 }],
524 ['use_x11==1', { 524 ['use_x11==1', {
525 'all_dependent_settings': { 525 'all_dependent_settings': {
526 'ldflags': [ 526 'ldflags': [
527 '-L<(PRODUCT_DIR)', 527 '-L<(PRODUCT_DIR)',
528 ], 528 ],
529 }, 529 },
530 'dependencies': [ 530 'dependencies': [
531 '../build/linux/system.gyp:x11', 531 '../../build/linux/system.gyp:x11',
532 '../build/linux/system.gyp:xcursor', 532 '../../build/linux/system.gyp:xcursor',
533 '../build/linux/system.gyp:xext', 533 '../../build/linux/system.gyp:xext',
534 '../build/linux/system.gyp:xfixes', 534 '../../build/linux/system.gyp:xfixes',
535 '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc. 535 '../../build/linux/system.gyp:xrender', # For XRender* function cal ls in x11_util.cc.
536 ], 536 ],
537 }], 537 }],
538 ['toolkit_views==0', { 538 ['toolkit_views==0', {
539 'sources!': [ 539 'sources!': [
540 'base/dragdrop/drop_target_event.cc', 540 'dragdrop/drop_target_event.cc',
541 'base/dragdrop/drop_target_event.h', 541 'dragdrop/drop_target_event.h',
542 ], 542 ],
543 }], 543 }],
544 ['OS=="android"', { 544 ['OS=="android"', {
545 'sources!': [ 545 'sources!': [
546 'base/default_theme_provider.cc', 546 'default_theme_provider.cc',
547 'base/dragdrop/drag_utils.cc', 547 'dragdrop/drag_utils.cc',
548 'base/dragdrop/drag_utils.h', 548 'dragdrop/drag_utils.h',
549 'base/l10n/l10n_font_util.cc', 549 'l10n/l10n_font_util.cc',
550 'base/models/button_menu_item_model.cc', 550 'models/button_menu_item_model.cc',
551 'base/models/dialog_model.cc', 551 'models/dialog_model.cc',
552 'base/theme_provider.cc', 552 'theme_provider.cc',
553 'base/touch/touch_device.cc', 553 'touch/touch_device.cc',
554 'base/touch/touch_editing_controller.cc', 554 'touch/touch_editing_controller.cc',
555 'base/ui_base_types.cc', 555 'ui_base_types.cc',
556 ], 556 ],
557 'dependencies': [ 557 'dependencies': [
558 'ui_base_jni_headers', 558 'ui_base_jni_headers',
559 ], 559 ],
560 'link_settings': { 560 'link_settings': {
561 'libraries': [ 561 'libraries': [
562 '-ljnigraphics', 562 '-ljnigraphics',
563 ], 563 ],
564 }, 564 },
565 }], 565 }],
566 ['OS=="android" and android_webview_build==0', { 566 ['OS=="android" and android_webview_build==0', {
567 'dependencies': [ 567 'dependencies': [
568 'android/ui_android.gyp:ui_java', 568 '../android/ui_android.gyp:ui_java',
569 ], 569 ],
570 }], 570 }],
571 ['OS=="android" and use_aura==0', { 571 ['OS=="android" and use_aura==0', {
572 'sources!': [ 572 'sources!': [
573 'base/cursor/cursor_android.cc' 573 'cursor/cursor_android.cc'
574 ], 574 ],
575 }], 575 }],
576 ['OS=="android" and use_aura==1', { 576 ['OS=="android" and use_aura==1', {
577 'sources!': [ 577 'sources!': [
578 'base/clipboard/clipboard_aura.cc' 578 'clipboard/clipboard_aura.cc'
579 ], 579 ],
580 }], 580 }],
581 ['OS=="android" or OS=="ios"', { 581 ['OS=="android" or OS=="ios"', {
582 'sources!': [ 582 'sources!': [
583 'base/device_form_factor_desktop.cc' 583 'device_form_factor_desktop.cc'
584 ], 584 ],
585 }], 585 }],
586 ['OS=="linux"', { 586 ['OS=="linux"', {
587 'libraries': [ 587 'libraries': [
588 '-ldl', 588 '-ldl',
589 ], 589 ],
590 }], 590 }],
591 ['use_system_icu==1', { 591 ['use_system_icu==1', {
592 # When using the system icu, the icu targets generate shim headers 592 # When using the system icu, the icu targets generate shim headers
593 # which are included by public headers in the ui target, so we need 593 # which are included by public headers in the ui target, so we need
(...skipping 12 matching lines...) Expand all
606 } 606 }
607 }, 607 },
608 ], 608 ],
609 'conditions': [ 609 'conditions': [
610 ['OS=="android"' , { 610 ['OS=="android"' , {
611 'targets': [ 611 'targets': [
612 { 612 {
613 'target_name': 'ui_base_jni_headers', 613 'target_name': 'ui_base_jni_headers',
614 'type': 'none', 614 'type': 'none',
615 'sources': [ 615 'sources': [
616 'android/java/src/org/chromium/ui/base/Clipboard.java', 616 '../android/java/src/org/chromium/ui/base/Clipboard.java',
617 'android/java/src/org/chromium/ui/base/LocalizationUtils.java', 617 '../android/java/src/org/chromium/ui/base/LocalizationUtils.java',
618 'android/java/src/org/chromium/ui/base/SelectFileDialog.java', 618 '../android/java/src/org/chromium/ui/base/SelectFileDialog.java',
619 'android/java/src/org/chromium/ui/base/TouchDevice.java', 619 '../android/java/src/org/chromium/ui/base/TouchDevice.java',
620 'android/java/src/org/chromium/ui/base/ViewAndroid.java', 620 '../android/java/src/org/chromium/ui/base/ViewAndroid.java',
621 'android/java/src/org/chromium/ui/base/WindowAndroid.java', 621 '../android/java/src/org/chromium/ui/base/WindowAndroid.java',
622 ], 622 ],
623 'variables': { 623 'variables': {
624 'jni_gen_package': 'ui', 624 'jni_gen_package': 'ui',
625 'jni_generator_ptr_type': 'long', 625 'jni_generator_ptr_type': 'long',
626 }, 626 },
627 'includes': [ '../build/jni_generator.gypi' ], 627 'includes': [ '../../build/jni_generator.gypi' ],
628 }, 628 },
629 ], 629 ],
630 }], 630 }],
631 ], 631 ],
632 } 632 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698