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

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

Issue 1236073002: Added build dependency from events_test_support to events_devices for ozone builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 'gesture_detection/velocity_tracker.h', 281 'gesture_detection/velocity_tracker.h',
282 'gesture_detection/velocity_tracker_state.cc', 282 'gesture_detection/velocity_tracker_state.cc',
283 'gesture_detection/velocity_tracker_state.h', 283 'gesture_detection/velocity_tracker_state.h',
284 ], 284 ],
285 'conditions': [ 285 'conditions': [
286 ['use_aura!=1 and OS!="android"', { 286 ['use_aura!=1 and OS!="android"', {
287 'sources': [ 287 'sources': [
288 'gesture_detection/gesture_configuration_default.cc', 288 'gesture_detection/gesture_configuration_default.cc',
289 ], 289 ],
290 }], 290 }],
291 ['use_aura==1 and OS=="android"', {
292 'sources!': [
293 'gesture_detection/gesture_configuration_aura.cc',
294 ],
295 }],
296 ], 291 ],
297 }, 292 },
298 { 293 {
299 # GN version: //ui/events:test_support 294 # GN version: //ui/events:test_support
300 'target_name': 'events_test_support', 295 'target_name': 'events_test_support',
301 'type': 'static_library', 296 'type': 'static_library',
302 'dependencies': [ 297 'dependencies': [
303 '<(DEPTH)/base/base.gyp:base', 298 '<(DEPTH)/base/base.gyp:base',
304 '<(DEPTH)/skia/skia.gyp:skia', 299 '<(DEPTH)/skia/skia.gyp:skia',
305 '../gfx/gfx.gyp:gfx_geometry', 300 '../gfx/gfx.gyp:gfx_geometry',
(...skipping 24 matching lines...) Expand all
330 'test/test_event_target.cc', 325 'test/test_event_target.cc',
331 'test/test_event_target.h', 326 'test/test_event_target.h',
332 'test/test_event_targeter.cc', 327 'test/test_event_targeter.cc',
333 'test/test_event_targeter.h', 328 'test/test_event_targeter.h',
334 ], 329 ],
335 'conditions': [ 330 'conditions': [
336 ['OS=="ios"', { 331 ['OS=="ios"', {
337 # The cocoa files don't apply to iOS. 332 # The cocoa files don't apply to iOS.
338 'sources/': [['exclude', 'cocoa']], 333 'sources/': [['exclude', 'cocoa']],
339 }], 334 }],
340 ['use_x11==1', {
341 'dependencies': [
342 'devices/events_devices.gyp:events_devices',
343 ],
344 }],
345 ['use_x11==1 or use_ozone==1', { 335 ['use_x11==1 or use_ozone==1', {
346 'sources' : [ 336 'sources' : [
347 'test/device_data_manager_test_api_impl.cc', 337 'test/device_data_manager_test_api_impl.cc',
348 ] 338 ],
339 'dependencies': [
340 'devices/events_devices.gyp:events_devices',
341 ],
349 }, { # else use_x11=1 or use_ozone=1 342 }, { # else use_x11=1 or use_ozone=1
350 'sources' : [ 343 'sources' : [
351 'test/device_data_manager_test_api_stub.cc', 344 'test/device_data_manager_test_api_stub.cc',
352 ] 345 ]
353 }], 346 }],
354 ], 347 ],
355 }, 348 },
356 { 349 {
357 # GN version: //ui/events:events_unittests 350 # GN version: //ui/events:events_unittests
358 'target_name': 'events_unittests', 351 'target_name': 'events_unittests',
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 'dependencies': [ 491 'dependencies': [
499 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 492 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
500 ], 493 ],
501 }], 494 }],
502 ], 495 ],
503 }, 496 },
504 ], 497 ],
505 }], 498 }],
506 ], 499 ],
507 } 500 }
OLDNEW
« no previous file with comments | « ui/events/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698