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

Side by Side Diff: content/content_shell.gypi

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month 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 | « chrome/chrome_tests_unit.gypi ('k') | content/shell/BUILD.gn » ('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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 307 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
308 'msvs_disabled_warnings': [ 4267, ], 308 'msvs_disabled_warnings': [ 4267, ],
309 }], # OS=="win" 309 }], # OS=="win"
310 ['OS=="linux"', { 310 ['OS=="linux"', {
311 'dependencies': [ 311 'dependencies': [
312 '../build/linux/system.gyp:fontconfig', 312 '../build/linux/system.gyp:fontconfig',
313 ], 313 ],
314 }], 314 }],
315 ['use_x11 == 1', { 315 ['use_x11 == 1', {
316 'dependencies': [ 316 'dependencies': [
317 '../ui/events/devices/events_devices.gyp:events_devices',
317 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 318 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
318 ], 319 ],
319 }], 320 }],
320 ['OS=="android"', { 321 ['OS=="android"', {
321 'dependencies': [ 322 'dependencies': [
322 '../mojo/mojo_base.gyp:libmojo_system_java', 323 '../mojo/mojo_base.gyp:libmojo_system_java',
323 'content_shell_jni_headers', 324 'content_shell_jni_headers',
324 ], 325 ],
325 'dependencies!': [ 326 'dependencies!': [
326 'copy_test_netscape_plugin', 327 'copy_test_netscape_plugin',
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1147 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1147 '--destination_dir', '<(dest_dir)', 1148 '--destination_dir', '<(dest_dir)',
1148 ], 1149 ],
1149 }, 1150 },
1150 ], 1151 ],
1151 }, 1152 },
1152 ], 1153 ],
1153 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1154 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1154 ] 1155 ]
1155 } 1156 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698