OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 | 6 |
7 if (is_android) { | 7 if (is_android) { |
8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
10 } | 10 } |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 "window_open_disposition.h", | 269 "window_open_disposition.h", |
270 "work_area_watcher_observer.h", | 270 "work_area_watcher_observer.h", |
271 ] | 271 ] |
272 | 272 |
273 if (is_win) { | 273 if (is_win) { |
274 sources += [ "touch/touch_device_win.cc" ] | 274 sources += [ "touch/touch_device_win.cc" ] |
275 } else if (is_android) { | 275 } else if (is_android) { |
276 sources += [ "touch/touch_device_android.cc" ] | 276 sources += [ "touch/touch_device_android.cc" ] |
277 } else if (use_ozone) { | 277 } else if (use_ozone) { |
278 sources += [ "touch/touch_device_ozone.cc" ] | 278 sources += [ "touch/touch_device_ozone.cc" ] |
279 } else if (use_aura && use_x11) { | 279 } else if (use_aura && use_x11) { |
280 sources += [ "touch/touch_device_aurax11.cc" ] | 280 sources += [ "touch/touch_device_aurax11.cc" ] |
281 } else { | 281 } else { |
282 # Empty implementation for all other cases. | 282 # Empty implementation for all other cases. |
283 sources += [ "touch/touch_device.cc" ] | 283 sources += [ "touch/touch_device.cc" ] |
284 } | 284 } |
285 | 285 |
286 defines = [ "UI_BASE_IMPLEMENTATION" ] | 286 defines = [ "UI_BASE_IMPLEMENTATION" ] |
287 | 287 |
288 public_deps = [ | 288 public_deps = [ |
289 "//base", | 289 "//base", |
290 "//skia", | 290 "//skia", |
291 "//ui/events/platform", | 291 "//ui/events/platform", |
292 "//ui/events:events_base", | 292 "//ui/events:events_base", |
293 "//ui/gfx", | 293 "//ui/gfx", |
294 "//ui/gfx/geometry", | 294 "//ui/gfx/geometry", |
295 ] | 295 ] |
296 deps = [ | 296 deps = [ |
297 "//base/third_party/dynamic_annotations", | 297 "//base/third_party/dynamic_annotations", |
298 "//base:base_static", | 298 "//base:base_static", |
299 "//base:i18n", | 299 "//base:i18n", |
300 "//net", | 300 "//net", |
301 "//third_party/icu", | 301 "//third_party/icu", |
302 "//ui/resources", | 302 "//ui/resources", |
303 "//ui/strings", | 303 "//ui/strings", |
304 "//url", | 304 "//url", |
305 ] | 305 ] |
306 | 306 |
307 if (build_ime) { | 307 if (build_ime) { |
308 if (!is_android) { | 308 if (!is_android) { |
309 deps += [ | 309 deps += [ "//ui/events" ] |
310 "//ui/events", | |
311 ] | |
312 } | 310 } |
313 | 311 |
314 sources += [ | 312 sources += [ |
315 "ime/candidate_window.cc", | 313 "ime/candidate_window.cc", |
316 "ime/candidate_window.h", | 314 "ime/candidate_window.h", |
317 "ime/chromeos/character_composer.cc", | 315 "ime/chromeos/character_composer.cc", |
318 "ime/chromeos/character_composer.h", | 316 "ime/chromeos/character_composer.h", |
319 "ime/chromeos/ime_bridge.cc", | 317 "ime/chromeos/ime_bridge.cc", |
320 "ime/chromeos/ime_bridge.h", | 318 "ime/chromeos/ime_bridge.h", |
321 "ime/chromeos/ime_keymap.cc", | 319 "ime/chromeos/ime_keymap.cc", |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 "ime/text_input_client.h", | 368 "ime/text_input_client.h", |
371 "ime/text_input_focus_manager.cc", | 369 "ime/text_input_focus_manager.cc", |
372 "ime/text_input_focus_manager.h", | 370 "ime/text_input_focus_manager.h", |
373 "ime/text_input_type.h", | 371 "ime/text_input_type.h", |
374 "ime/win/imm32_manager.cc", | 372 "ime/win/imm32_manager.cc", |
375 "ime/win/imm32_manager.h", | 373 "ime/win/imm32_manager.h", |
376 "ime/win/tsf_input_scope.cc", | 374 "ime/win/tsf_input_scope.cc", |
377 "ime/win/tsf_input_scope.h", | 375 "ime/win/tsf_input_scope.h", |
378 ] | 376 ] |
379 | 377 |
380 if (!use_aura || (!is_linux && !use_ozone)) { | 378 if (!use_aura || !is_linux && !use_ozone) { |
381 sources -= [ | 379 sources -= [ |
382 "ime/input_method_auralinux.cc", | 380 "ime/input_method_auralinux.cc", |
383 "ime/input_method_auralinux.h", | 381 "ime/input_method_auralinux.h", |
384 ] | 382 ] |
385 } | 383 } |
386 | 384 |
387 if (!toolkit_views && !use_aura) { | 385 if (!toolkit_views && !use_aura) { |
388 sources -= [ | 386 sources -= [ |
389 "ime/input_method_factory.cc", | 387 "ime/input_method_factory.cc", |
390 "ime/input_method_factory.h", | 388 "ime/input_method_factory.h", |
391 "ime/input_method_minimal.cc", | 389 "ime/input_method_minimal.cc", |
392 "ime/input_method_minimal.h", | 390 "ime/input_method_minimal.h", |
393 ] | 391 ] |
394 } | 392 } |
395 | 393 |
396 if (is_chromeos) { | 394 if (is_chromeos) { |
397 deps += [ | 395 deps += [ "//chromeos" ] |
398 "//chromeos", | |
399 ] | |
400 } | 396 } |
401 | 397 |
402 if (use_pango) { | 398 if (use_pango) { |
403 configs += [ "//build/config/linux:pangocairo" ] | 399 configs += [ "//build/config/linux:pangocairo" ] |
404 } else { | 400 } else { |
405 sources -= [ | 401 sources -= [ |
406 "ime/composition_text_util_pango.cc", | 402 "ime/composition_text_util_pango.cc", |
407 "ime/composition_text_util_pango.h", | 403 "ime/composition_text_util_pango.h", |
408 ] | 404 ] |
409 } | 405 } |
410 } | 406 } |
411 | 407 |
412 if (is_ios) { | 408 if (is_ios) { |
413 sources += [ | 409 sources += [ |
414 "l10n/l10n_util_mac.h", | 410 "l10n/l10n_util_mac.h", |
415 "l10n/l10n_util_mac.mm", | 411 "l10n/l10n_util_mac.mm", |
416 ] | 412 ] |
417 } | 413 } |
418 | 414 |
419 if (toolkit_views) { | 415 if (toolkit_views) { |
420 deps += [ | 416 deps += [ "//ui/events" ] |
421 "//ui/events", | |
422 ] | |
423 } | 417 } |
424 | 418 |
425 if (use_x11 && use_aura) { | 419 if (use_x11 && use_aura) { |
426 sources += [ | 420 sources += [ |
427 "x/selection_owner.cc", | 421 "x/selection_owner.cc", |
428 "x/selection_owner.h", | 422 "x/selection_owner.h", |
429 "x/selection_requestor.cc", | 423 "x/selection_requestor.cc", |
430 "x/selection_requestor.h", | 424 "x/selection_requestor.h", |
431 "x/selection_utils.cc", | 425 "x/selection_utils.cc", |
432 "x/selection_utils.h", | 426 "x/selection_utils.h", |
433 ] | 427 ] |
434 } | 428 } |
435 | 429 |
436 if (use_aura) { | 430 if (use_aura) { |
437 deps += [ | 431 deps += [ "//ui/events" ] |
438 "//ui/events", | |
439 ] | |
440 } else { | 432 } else { |
441 sources -= [ | 433 sources -= [ |
442 "cursor/cursor.cc", | 434 "cursor/cursor.cc", |
443 "cursor/cursor.h", | 435 "cursor/cursor.h", |
444 "dragdrop/drag_utils_aura.cc", | 436 "dragdrop/drag_utils_aura.cc", |
445 ] | 437 ] |
446 } | 438 } |
447 if (use_x11) { | 439 if (use_x11) { |
448 sources += [ | 440 sources += [ |
449 "x/x11_foreign_window_manager.cc", | 441 "x/x11_foreign_window_manager.cc", |
450 "x/x11_foreign_window_manager.h", | 442 "x/x11_foreign_window_manager.h", |
451 "x/x11_menu_list.cc", | 443 "x/x11_menu_list.cc", |
452 "x/x11_menu_list.h", | 444 "x/x11_menu_list.h", |
453 "x/x11_util.cc", | 445 "x/x11_util.cc", |
454 "x/x11_util.h", | 446 "x/x11_util.h", |
455 "x/x11_util_internal.h", | 447 "x/x11_util_internal.h", |
456 ] | 448 ] |
457 deps += [ "//ui/gfx/x" ] | 449 deps += [ "//ui/gfx/x" ] |
458 } | 450 } |
459 | 451 |
460 if (!use_aura || !is_linux) { | 452 if (!use_aura || !is_linux) { |
461 sources -= [ | 453 sources -= [ "resource/resource_bundle_auralinux.cc" ] |
462 "resource/resource_bundle_auralinux.cc", | |
463 ] | |
464 } | 454 } |
465 | 455 |
466 if (use_aura && is_win) { | 456 if (use_aura && is_win) { |
467 sources -= [ | 457 sources -= [ "dragdrop/drag_utils_aura.cc" ] |
468 "dragdrop/drag_utils_aura.cc", | |
469 ] | |
470 } | 458 } |
471 | 459 |
472 if (is_linux) { | 460 if (is_linux) { |
473 configs += [ | 461 configs += [ |
474 "//build/config/linux:fontconfig", | 462 "//build/config/linux:fontconfig", |
475 "//build/config/linux:glib", | 463 "//build/config/linux:glib", |
476 ] | 464 ] |
477 } | 465 } |
478 | 466 |
479 if ((is_linux && !is_chromeos) || is_chromeos) { | 467 if (is_linux && !is_chromeos || is_chromeos) { |
480 if (!toolkit_views && !use_aura) { | 468 if (!toolkit_views && !use_aura) { |
481 sources -= [ | 469 sources -= [ |
482 "dragdrop/drag_utils.cc", | 470 "dragdrop/drag_utils.cc", |
483 "dragdrop/drag_utils.h", | 471 "dragdrop/drag_utils.h", |
484 ] | 472 ] |
485 } | 473 } |
486 } | 474 } |
487 | 475 |
488 if (is_chromeos || (use_aura && is_linux && !use_x11)) { | 476 if (is_chromeos || use_aura && is_linux && !use_x11) { |
489 sources += [ | 477 sources += [ |
490 "dragdrop/os_exchange_data_provider_aura.cc", | 478 "dragdrop/os_exchange_data_provider_aura.cc", |
491 "dragdrop/os_exchange_data_provider_aura.h", | 479 "dragdrop/os_exchange_data_provider_aura.h", |
492 ] | 480 ] |
493 } | 481 } |
494 | 482 |
495 libs = [] | 483 libs = [] |
496 if (is_win) { | 484 if (is_win) { |
497 sources += [ | 485 sources += [ |
498 "cursor/cursor_loader_win.cc", | 486 "cursor/cursor_loader_win.cc", |
499 "cursor/cursor_loader_win.h", | 487 "cursor/cursor_loader_win.h", |
500 ] | 488 ] |
501 deps += [ | 489 deps += [ "//third_party/wtl" ] |
502 "//third_party/wtl", | |
503 ] | |
504 cflags = [ | 490 cflags = [ |
505 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int. | 491 "/wd4267", # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int. |
506 "/wd4324", # Structure was padded due to __declspec(align()), which is | 492 "/wd4324", # Structure was padded due to __declspec(align()), which is |
507 # uninteresting. | 493 # uninteresting. |
508 ] | 494 ] |
509 ldflags = [ | 495 ldflags = [ |
510 "/DELAYLOAD:d2d1.dll", | 496 "/DELAYLOAD:d2d1.dll", |
511 "/DELAYLOAD:d3d10_1.dll", | 497 "/DELAYLOAD:d3d10_1.dll", |
512 "/DELAYLOAD:dwmapi.dll", | 498 "/DELAYLOAD:dwmapi.dll", |
513 ] | 499 ] |
514 libs += [ | 500 libs += [ |
515 "d2d1.lib", | 501 "d2d1.lib", |
516 "d3d10_1.lib", | 502 "d3d10_1.lib", |
517 "dwmapi.lib", | 503 "dwmapi.lib", |
518 "imm32.lib", | 504 "imm32.lib", |
519 "d2d1.lib", | 505 "d2d1.lib", |
520 "dwmapi.lib", | 506 "dwmapi.lib", |
521 "oleacc.lib", | 507 "oleacc.lib", |
522 ] | 508 ] |
523 } else { | 509 } else { |
524 if (!use_aura) { | 510 if (!use_aura) { |
525 sources -= [ | 511 sources -= [ |
526 "view_prop.cc", | 512 "view_prop.cc", |
527 "view_prop.h", | 513 "view_prop.h", |
528 ] | 514 ] |
529 } | 515 } |
530 } | 516 } |
531 | 517 |
532 if (is_mac) { | 518 if (is_mac) { |
533 deps += [ | 519 deps += [ "//third_party/mozilla" ] |
534 "//third_party/mozilla", | |
535 ] | |
536 | 520 |
537 sources -= [ | 521 sources -= [ |
538 "cursor/image_cursors.cc", | 522 "cursor/image_cursors.cc", |
539 "cursor/image_cursors.h", | 523 "cursor/image_cursors.h", |
540 "dragdrop/drag_utils.cc", | 524 "dragdrop/drag_utils.cc", |
541 "dragdrop/drag_utils.h", | 525 "dragdrop/drag_utils.h", |
542 ] | 526 ] |
543 | 527 |
544 libs += [ | 528 libs += [ |
545 "Accelerate.framework", | 529 "Accelerate.framework", |
546 "AudioUnit.framework", | 530 "AudioUnit.framework", |
547 "CoreVideo.framework", | 531 "CoreVideo.framework", |
548 ] | 532 ] |
549 } | 533 } |
550 | 534 |
551 if (use_x11) { | 535 if (use_x11) { |
552 #'all_dependent_settings': { | 536 #'all_dependent_settings': { |
553 #'ldflags': [ | 537 #'ldflags': [ |
554 #'-L<(PRODUCT_DIR)', | 538 #'-L<(PRODUCT_DIR)', |
555 #], | 539 #], |
556 #}, | 540 #}, |
557 configs += [ | 541 configs += [ "//build/config/linux:x11" ] |
558 "//build/config/linux:x11" | |
559 ] | |
560 } | 542 } |
561 | 543 |
562 if (use_aura) { | 544 if (use_aura) { |
563 if (use_x11) { | 545 if (use_x11) { |
564 sources += [ | 546 sources += [ |
565 "cursor/cursor_loader_x11.cc", | 547 "cursor/cursor_loader_x11.cc", |
566 "cursor/cursor_loader_x11.h", | 548 "cursor/cursor_loader_x11.h", |
567 "cursor/cursor_x11.cc", | 549 "cursor/cursor_x11.cc", |
568 ] | 550 ] |
569 if (!is_chromeos) { | 551 if (!is_chromeos) { |
570 # These Aura X11 files aren't used on ChromeOS. | 552 # These Aura X11 files aren't used on ChromeOS. |
571 sources += [ | 553 sources += [ |
572 "dragdrop/os_exchange_data_provider_aurax11.cc", | 554 "dragdrop/os_exchange_data_provider_aurax11.cc", |
573 "dragdrop/os_exchange_data_provider_aurax11.h", | 555 "dragdrop/os_exchange_data_provider_aurax11.h", |
574 ] | 556 ] |
575 } | 557 } |
576 } | 558 } |
577 } | 559 } |
578 if (use_ozone) { | 560 if (use_ozone) { |
579 sources += [ | 561 sources += [ |
580 "cursor/cursor_loader_ozone.cc", | 562 "cursor/cursor_loader_ozone.cc", |
581 "cursor/cursor_loader_ozone.h", | 563 "cursor/cursor_loader_ozone.h", |
582 "cursor/cursor_ozone.cc", | 564 "cursor/cursor_ozone.cc", |
583 "cursor/ozone/bitmap_cursor_factory_ozone.cc", | 565 "cursor/ozone/bitmap_cursor_factory_ozone.cc", |
584 "cursor/ozone/bitmap_cursor_factory_ozone.h", | 566 "cursor/ozone/bitmap_cursor_factory_ozone.h", |
585 ] | 567 ] |
586 | 568 |
587 deps += [ | 569 deps += [ "//ui/ozone:ozone_base" ] |
588 "//ui/ozone:ozone_base", | |
589 ] | |
590 } | 570 } |
591 | 571 |
592 if (!toolkit_views) { | 572 if (!toolkit_views) { |
593 sources -= [ | 573 sources -= [ |
594 "dragdrop/drag_drop_types.h", | 574 "dragdrop/drag_drop_types.h", |
595 "dragdrop/drop_target_event.cc", | 575 "dragdrop/drop_target_event.cc", |
596 "dragdrop/drop_target_event.h", | 576 "dragdrop/drop_target_event.h", |
597 "dragdrop/os_exchange_data.cc", | 577 "dragdrop/os_exchange_data.cc", |
598 "dragdrop/os_exchange_data.h", | 578 "dragdrop/os_exchange_data.h", |
599 "nine_image_painter_factory.cc", | 579 "nine_image_painter_factory.cc", |
600 "nine_image_painter_factory.h", | 580 "nine_image_painter_factory.h", |
601 ] | 581 ] |
602 } | 582 } |
603 | 583 |
604 if (is_android) { | 584 if (is_android) { |
605 sources -= [ | 585 sources -= [ |
606 "cursor/image_cursors.cc", | 586 "cursor/image_cursors.cc", |
607 "cursor/image_cursors.h", | 587 "cursor/image_cursors.h", |
608 "default_theme_provider.cc", | 588 "default_theme_provider.cc", |
609 "dragdrop/drag_utils.cc", | 589 "dragdrop/drag_utils.cc", |
610 "dragdrop/drag_utils.h", | 590 "dragdrop/drag_utils.h", |
611 "l10n/l10n_font_util.cc", | 591 "l10n/l10n_font_util.cc", |
612 "models/button_menu_item_model.cc", | 592 "models/button_menu_item_model.cc", |
613 "models/dialog_model.cc", | 593 "models/dialog_model.cc", |
614 "theme_provider.cc", | 594 "theme_provider.cc", |
615 "touch/touch_editing_controller.cc", | 595 "touch/touch_editing_controller.cc", |
616 "ui_base_types.cc", | 596 "ui_base_types.cc", |
617 ] | 597 ] |
618 | 598 |
619 deps += [ | 599 deps += [ ":ui_base_jni_headers" ] |
620 ":ui_base_jni_headers", | |
621 ] | |
622 | 600 |
623 libs += [ | 601 libs += [ "jnigraphics" ] |
624 "jnigraphics", | |
625 ] | |
626 } | 602 } |
627 | 603 |
628 if (is_android && is_android_webview_build) { | 604 if (is_android && is_android_webview_build) { |
629 deps += [ | 605 deps += [ |
630 #TODO(GYP): port this component to GN. | 606 #TODO(GYP): port this component to GN. |
631 #"//ui/android:ui_java", | 607 #"//ui/android:ui_java", |
632 ] | 608 ] |
633 } | 609 } |
634 | 610 |
635 if (is_android && !use_aura) { | 611 if (is_android && !use_aura) { |
636 sources -= [ | 612 sources -= [ "cursor/cursor_android.cc" ] |
637 "cursor/cursor_android.cc", | |
638 ] | |
639 } | 613 } |
640 | 614 |
641 # Aura clipboard. | 615 # Aura clipboard. |
642 if (use_aura) { | 616 if (use_aura) { |
643 if (use_x11) { | 617 if (use_x11) { |
644 sources += [ "clipboard/clipboard_aurax11.cc" ] | 618 sources += [ "clipboard/clipboard_aurax11.cc" ] |
645 } else if (!is_win) { | 619 } else if (!is_win) { |
646 # This file is used for all non-X11, non-Windows aura Builds. | 620 # This file is used for all non-X11, non-Windows aura Builds. |
647 sources += [ "clipboard/clipboard_aura.cc" ] | 621 sources += [ "clipboard/clipboard_aura.cc" ] |
648 } | 622 } |
649 } | 623 } |
650 | 624 |
651 if (is_android || is_ios) { | 625 if (is_android || is_ios) { |
652 sources -= [ | 626 sources -= [ "device_form_factor_desktop.cc" ] |
653 "device_form_factor_desktop.cc", | |
654 ] | |
655 } | 627 } |
656 } | 628 } |
657 | 629 |
658 source_set("test_support") { | 630 source_set("test_support") { |
659 testonly = true | 631 testonly = true |
660 sources = [ | 632 sources = [ |
661 "test/test_clipboard.cc", | 633 "test/test_clipboard.cc", |
662 "test/test_clipboard.h", | 634 "test/test_clipboard.h", |
663 "test/ui_controls.h", | 635 "test/ui_controls.h", |
664 "test/ui_controls_aura.cc", | 636 "test/ui_controls_aura.cc", |
(...skipping 18 matching lines...) Expand all Loading... |
683 if (build_ime) { | 655 if (build_ime) { |
684 sources += [ | 656 sources += [ |
685 "ime/dummy_input_method.cc", | 657 "ime/dummy_input_method.cc", |
686 "ime/dummy_input_method.h", | 658 "ime/dummy_input_method.h", |
687 "ime/dummy_text_input_client.cc", | 659 "ime/dummy_text_input_client.cc", |
688 "ime/dummy_text_input_client.h", | 660 "ime/dummy_text_input_client.h", |
689 ] | 661 ] |
690 } | 662 } |
691 | 663 |
692 if (!use_aura) { | 664 if (!use_aura) { |
693 sources -= [ | 665 sources -= [ "test/ui_controls_aura.cc" ] |
694 "test/ui_controls_aura.cc", | |
695 ] | |
696 } | 666 } |
697 } | 667 } |
698 | 668 |
699 if (is_android) { | 669 if (is_android) { |
700 generate_jni("ui_base_jni_headers") { | 670 generate_jni("ui_base_jni_headers") { |
701 sources = [ | 671 sources = [ |
702 "../android/java/src/org/chromium/ui/base/Clipboard.java", | 672 "../android/java/src/org/chromium/ui/base/Clipboard.java", |
703 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", | 673 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", |
704 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java", | 674 "../android/java/src/org/chromium/ui/base/LocalizationUtils.java", |
705 "../android/java/src/org/chromium/ui/base/ResourceBundle.java", | 675 "../android/java/src/org/chromium/ui/base/ResourceBundle.java", |
706 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", | 676 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", |
707 "../android/java/src/org/chromium/ui/base/TouchDevice.java", | 677 "../android/java/src/org/chromium/ui/base/TouchDevice.java", |
708 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", | 678 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", |
709 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", | 679 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", |
710 ] | 680 ] |
711 jni_package = "base" | 681 jni_package = "base" |
712 } | 682 } |
713 } | 683 } |
714 | 684 |
715 # TODO(GYP): Make this work on Android and reenable it. | 685 # TODO(GYP): Make this work on Android and reenable it. |
716 if (!is_android) { | 686 if (!is_android) { |
717 # TODO(tfarina): Rename this target to ui_base_unittests. | 687 # TODO(tfarina): Rename this target to ui_base_unittests. |
718 # In order to do this we will need to keep this target, add a dummy | 688 # In order to do this we will need to keep this target, add a dummy |
719 # ui_base_unittests target that just points to ui_unittests, change | 689 # ui_base_unittests target that just points to ui_unittests, change |
720 # buildbot code to reference the new 'ui_base_unittests' target. | 690 # buildbot code to reference the new 'ui_base_unittests' target. |
721 # After buildbot is updated, we can make the changes in Chromium and | 691 # After buildbot is updated, we can make the changes in Chromium and |
722 # remove 'ui_unittests' target. crbug.com/331829 | 692 # remove 'ui_unittests' target. crbug.com/331829 |
723 # GYP version: ui/base/ui_base_tests.gyp:ui_unittests | 693 # GYP version: ui/base/ui_base_tests.gyp:ui_unittests |
724 test("ui_unittests") { | 694 test("ui_unittests") { |
725 sources = [ | 695 sources = [ |
726 "l10n/l10n_util_mac_unittest.mm", | 696 "l10n/l10n_util_mac_unittest.mm", |
727 "l10n/l10n_util_unittest.cc", | 697 "l10n/l10n_util_unittest.cc", |
728 "l10n/l10n_util_win_unittest.cc", | 698 "l10n/l10n_util_win_unittest.cc", |
729 "l10n/time_format_unittest.cc", | 699 "l10n/time_format_unittest.cc", |
730 "layout_unittest.cc", | 700 "layout_unittest.cc", |
731 "models/tree_node_iterator_unittest.cc", | 701 "models/tree_node_iterator_unittest.cc", |
732 "resource/data_pack_literal.cc", | 702 "resource/data_pack_literal.cc", |
733 "resource/data_pack_unittest.cc", | 703 "resource/data_pack_unittest.cc", |
734 "resource/resource_bundle_unittest.cc", | 704 "resource/resource_bundle_unittest.cc", |
735 "test/test_clipboard_unittest.cc", | 705 "test/test_clipboard_unittest.cc", |
736 "test/run_all_unittests.cc", | 706 "test/run_all_unittests.cc", |
737 ] | 707 ] |
738 | 708 |
739 if (is_ios) { | 709 if (is_ios) { |
740 # Compile this Mac file on iOS as well. | 710 # Compile this Mac file on iOS as well. |
741 set_sources_assignment_filter([]) | 711 set_sources_assignment_filter([]) |
742 sources += [ "l10n/l10n_util_mac_unittest.mm" ] | 712 sources += [ "l10n/l10n_util_mac_unittest.mm" ] |
743 set_sources_assignment_filter(sources_assignment_filter) | 713 set_sources_assignment_filter(sources_assignment_filter) |
744 } else { # !is_ios | 714 } else { # !is_ios |
745 sources += [ | 715 sources += [ |
746 "accelerators/accelerator_manager_unittest.cc", | 716 "accelerators/accelerator_manager_unittest.cc", |
747 "accelerators/menu_label_accelerator_util_linux_unittest.cc", | 717 "accelerators/menu_label_accelerator_util_linux_unittest.cc", |
748 "clipboard/custom_data_helper_unittest.cc", | 718 "clipboard/custom_data_helper_unittest.cc", |
749 "cocoa/base_view_unittest.mm", | 719 "cocoa/base_view_unittest.mm", |
750 "cocoa/cocoa_base_utils_unittest.mm", | 720 "cocoa/cocoa_base_utils_unittest.mm", |
751 "cocoa/controls/blue_label_button_unittest.mm", | 721 "cocoa/controls/blue_label_button_unittest.mm", |
752 "cocoa/controls/hover_image_menu_button_unittest.mm", | 722 "cocoa/controls/hover_image_menu_button_unittest.mm", |
753 "cocoa/controls/hyperlink_button_cell_unittest.mm", | 723 "cocoa/controls/hyperlink_button_cell_unittest.mm", |
754 "cocoa/controls/hyperlink_text_view_unittest.mm", | 724 "cocoa/controls/hyperlink_text_view_unittest.mm", |
755 "cocoa/focus_tracker_unittest.mm", | 725 "cocoa/focus_tracker_unittest.mm", |
756 "cocoa/fullscreen_window_manager_unittest.mm", | 726 "cocoa/fullscreen_window_manager_unittest.mm", |
757 "cocoa/hover_image_button_unittest.mm", | 727 "cocoa/hover_image_button_unittest.mm", |
758 "cocoa/menu_controller_unittest.mm", | 728 "cocoa/menu_controller_unittest.mm", |
759 "cocoa/nsgraphics_context_additions_unittest.mm", | 729 "cocoa/nsgraphics_context_additions_unittest.mm", |
760 "cocoa/nsview_additions_unittest.mm", | 730 "cocoa/nsview_additions_unittest.mm", |
761 "cocoa/tracking_area_unittest.mm", | 731 "cocoa/tracking_area_unittest.mm", |
762 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", | 732 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", |
763 "models/list_model_unittest.cc", | 733 "models/list_model_unittest.cc", |
764 "models/list_selection_model_unittest.cc", | 734 "models/list_selection_model_unittest.cc", |
765 "models/tree_node_model_unittest.cc", | 735 "models/tree_node_model_unittest.cc", |
766 "test/data/resource.h", | 736 "test/data/resource.h", |
767 "text/bytes_formatting_unittest.cc", | 737 "text/bytes_formatting_unittest.cc", |
768 "touch/touch_editing_controller_unittest.cc", | 738 "touch/touch_editing_controller_unittest.cc", |
769 "view_prop_unittest.cc", | 739 "view_prop_unittest.cc", |
770 "webui/web_ui_util_unittest.cc", | 740 "webui/web_ui_util_unittest.cc", |
771 "x/selection_requestor_unittest.cc", | 741 "x/selection_requestor_unittest.cc", |
772 ] | |
773 } | |
774 | |
775 if (build_ime) { | |
776 sources += [ | |
777 "ime/candidate_window_unittest.cc", | |
778 "ime/chromeos/character_composer_unittest.cc", | |
779 "ime/input_method_base_unittest.cc", | |
780 "ime/input_method_chromeos_unittest.cc", | |
781 "ime/remote_input_method_win_unittest.cc", | |
782 "ime/win/imm32_manager_unittest.cc", | |
783 "ime/win/tsf_input_scope_unittest.cc", | |
784 ] | |
785 if (use_x11) { | |
786 sources += [ "ime/composition_text_util_pango_unittest.cc" ] | |
787 } | |
788 if (!use_x11 && is_chromeos) { | |
789 # These were already removed in the non-chromeos case. | |
790 sources -= [ | |
791 "ime/chromeos/character_composer_unittest.cc", | |
792 "ime/input_method_chromeos_unittest.cc", | |
793 ] | 742 ] |
794 } | 743 } |
795 } | |
796 | 744 |
797 deps = [ | 745 if (build_ime) { |
798 "//base", | 746 sources += [ |
799 "//base/allocator", | 747 "ime/candidate_window_unittest.cc", |
800 "//base/test:test_support", | 748 "ime/chromeos/character_composer_unittest.cc", |
801 "//net", | 749 "ime/input_method_base_unittest.cc", |
802 "//skia", | 750 "ime/input_method_chromeos_unittest.cc", |
803 "//testing/gmock", | 751 "ime/remote_input_method_win_unittest.cc", |
804 "//testing/gtest", | 752 "ime/win/imm32_manager_unittest.cc", |
805 "//third_party/icu", | 753 "ime/win/tsf_input_scope_unittest.cc", |
806 "//ui/base", | 754 ] |
807 "//ui/base:test_support", | 755 if (use_x11) { |
808 "//ui/events:events_base", | 756 sources += [ "ime/composition_text_util_pango_unittest.cc" ] |
809 "//ui/events:test_support", | 757 } |
810 "//ui/gfx:test_support", | 758 if (!use_x11 && is_chromeos) { |
811 "//ui/resources", | 759 # These were already removed in the non-chromeos case. |
812 "//ui/resources:ui_test_pak", | 760 sources -= [ |
813 "//ui/strings", | 761 "ime/chromeos/character_composer_unittest.cc", |
814 "//url", | 762 "ime/input_method_chromeos_unittest.cc", |
815 ] | 763 ] |
| 764 } |
| 765 } |
816 | 766 |
817 if (is_ios) { | 767 deps = [ |
818 # TODO(GYP) lots of iOS-only steps for ui_unittests | 768 "//base", |
819 } | 769 "//base/allocator", |
820 | 770 "//base/test:test_support", |
821 if (is_win) { | 771 "//net", |
822 sources += [ | 772 "//skia", |
823 "dragdrop/os_exchange_data_win_unittest.cc", | 773 "//testing/gmock", |
824 "win/hwnd_subclass_unittest.cc", | 774 "//testing/gtest", |
825 "win/open_file_name_win_unittest.cc", | 775 "//third_party/icu", |
| 776 "//ui/base", |
| 777 "//ui/base:test_support", |
| 778 "//ui/events:events_base", |
| 779 "//ui/events:test_support", |
| 780 "//ui/gfx:test_support", |
| 781 "//ui/resources", |
| 782 "//ui/resources:ui_test_pak", |
| 783 "//ui/strings", |
| 784 "//url", |
826 ] | 785 ] |
827 | 786 |
828 ldflags = [ | 787 if (is_ios) { |
829 "/DELAYLOAD:d2d1.dll", | 788 # TODO(GYP) lots of iOS-only steps for ui_unittests |
830 "/DELAYLOAD:d3d10_1.dll", | 789 } |
831 ] | |
832 libs = [ | |
833 "d2d1.lib", | |
834 "d3d10_1.lib", | |
835 "imm32.lib", | |
836 "oleacc.lib", | |
837 ] | |
838 | 790 |
839 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 791 if (is_win) { |
840 cflags = [ "/wd4267" ] | 792 sources += [ |
841 } | 793 "dragdrop/os_exchange_data_win_unittest.cc", |
| 794 "win/hwnd_subclass_unittest.cc", |
| 795 "win/open_file_name_win_unittest.cc", |
| 796 ] |
842 | 797 |
843 if (is_android) { | 798 ldflags = [ |
844 deps += [ | 799 "/DELAYLOAD:d2d1.dll", |
845 #"testing/android/native_test.gyp:native_test_native_code" TODO(GYP) | 800 "/DELAYLOAD:d3d10_1.dll", |
846 ] | 801 ] |
847 } | 802 libs = [ |
| 803 "d2d1.lib", |
| 804 "d3d10_1.lib", |
| 805 "imm32.lib", |
| 806 "oleacc.lib", |
| 807 ] |
848 | 808 |
849 if (use_pango) { | 809 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
850 configs += [ | 810 cflags = [ "/wd4267" ] |
851 "//build/config/linux:pangocairo" | 811 } |
852 ] | |
853 } | |
854 | 812 |
855 if (use_x11) { | 813 if (is_android) { |
856 sources += [ | 814 deps += [ |
857 "cursor/cursor_loader_x11_unittest.cc" | 815 #"testing/android/native_test.gyp:native_test_native_code" TODO(GYP) |
858 ] | 816 ] |
| 817 } |
859 | 818 |
860 configs += [ | 819 if (use_pango) { |
861 "//build/config/linux:x11" | 820 configs += [ "//build/config/linux:pangocairo" ] |
862 ] | 821 } |
863 | 822 |
864 deps += [ | 823 if (use_x11) { |
865 "//ui/events/platform/x11", | 824 sources += [ "cursor/cursor_loader_x11_unittest.cc" ] |
866 "//ui/gfx/x", | |
867 ] | |
868 | 825 |
869 datadeps = [ | 826 configs += [ "//build/config/linux:x11" ] |
870 "//tools/xdisplaycheck" | |
871 ] | |
872 } | |
873 | 827 |
874 if (!is_win || !use_aura) { | 828 deps += [ |
875 sources -= [ | 829 "//ui/events/platform/x11", |
876 "view_prop_unittest.cc" | 830 "//ui/gfx/x", |
877 ] | 831 ] |
878 } | |
879 | 832 |
880 if (is_mac) { | 833 datadeps = [ |
881 sources -= [ | 834 "//tools/xdisplaycheck", |
882 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", | 835 ] |
883 "x/selection_requestor_unittest.cc", | 836 } |
884 ] | |
885 | 837 |
886 deps += [ | 838 if (!is_win || !use_aura) { |
887 "//third_party/mozilla", | 839 sources -= [ "view_prop_unittest.cc" ] |
888 #'ui_unittests_bundle', TODO(GYP) | 840 } |
889 ] | |
890 } | |
891 | 841 |
892 if (use_aura || toolkit_views) { | 842 if (is_mac) { |
893 sources += [ | 843 sources -= [ |
894 "dragdrop/os_exchange_data_unittest.cc" | 844 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", |
895 ] | 845 "x/selection_requestor_unittest.cc", |
| 846 ] |
896 | 847 |
897 deps += [ | 848 deps += [ |
898 "//ui/events", | 849 "//third_party/mozilla", |
899 "//ui/events/platform", | 850 #'ui_unittests_bundle', TODO(GYP) |
900 ] | 851 ] |
901 } | 852 } |
902 | 853 |
903 if (is_chromeos) { | 854 if (use_aura || toolkit_views) { |
904 sources -= [ | 855 sources += [ "dragdrop/os_exchange_data_unittest.cc" ] |
905 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", | 856 |
906 "x/selection_requestor_unittest.cc", | 857 deps += [ |
907 ] | 858 "//ui/events", |
908 deps += [ | 859 "//ui/events/platform", |
909 "//chromeos", | 860 ] |
910 ] | 861 } |
| 862 |
| 863 if (is_chromeos) { |
| 864 sources -= [ |
| 865 "dragdrop/os_exchange_data_provider_aurax11_unittest.cc", |
| 866 "x/selection_requestor_unittest.cc", |
| 867 ] |
| 868 deps += [ "//chromeos" ] |
| 869 } |
911 } | 870 } |
912 } | 871 } |
913 } | |
914 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). | 872 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk). |
OLD | NEW |