Chromium Code Reviews| 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/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/sanitizers/sanitizers.gni") | 7 import("//build/config/sanitizers/sanitizers.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 10 import("//ui/base/ui_features.gni") | 10 import("//ui/base/ui_features.gni") |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 144 "cursor/cursor_loader.h", | 144 "cursor/cursor_loader.h", |
| 145 "cursor/cursor_win.cc", | 145 "cursor/cursor_win.cc", |
| 146 "default_style.h", | 146 "default_style.h", |
| 147 "default_theme_provider_mac.mm", | 147 "default_theme_provider_mac.mm", |
| 148 "device_form_factor.h", | 148 "device_form_factor.h", |
| 149 "device_form_factor_android.cc", | 149 "device_form_factor_android.cc", |
| 150 "device_form_factor_android.h", | 150 "device_form_factor_android.h", |
| 151 "device_form_factor_desktop.cc", | 151 "device_form_factor_desktop.cc", |
| 152 "device_form_factor_ios.mm", | 152 "device_form_factor_ios.mm", |
| 153 "dragdrop/drag_drop_types.h", | 153 "dragdrop/drag_drop_types.h", |
| 154 "dragdrop/drag_drop_types_mac.mm", | |
| 154 "dragdrop/drag_drop_types_win.cc", | 155 "dragdrop/drag_drop_types_win.cc", |
| 155 "dragdrop/drag_source_win.cc", | 156 "dragdrop/drag_source_win.cc", |
| 156 "dragdrop/drag_source_win.h", | 157 "dragdrop/drag_source_win.h", |
| 157 "dragdrop/drag_utils_aura.cc", | 158 "dragdrop/drag_utils.cc", |
|
tapted
2016/05/26 12:31:41
this is added in !is_ios, so doesn't need to be li
spqchan
2016/05/27 23:25:48
Done.
| |
| 158 "dragdrop/drag_utils_mac.mm", | |
| 159 "dragdrop/drag_utils_win.cc", | 159 "dragdrop/drag_utils_win.cc", |
| 160 "dragdrop/drop_target_event.cc", | 160 "dragdrop/drop_target_event.cc", |
| 161 "dragdrop/drop_target_event.h", | 161 "dragdrop/drop_target_event.h", |
| 162 "dragdrop/drop_target_win.cc", | 162 "dragdrop/drop_target_win.cc", |
| 163 "dragdrop/drop_target_win.h", | 163 "dragdrop/drop_target_win.h", |
| 164 "dragdrop/os_exchange_data.cc", | 164 "dragdrop/os_exchange_data.cc", |
| 165 "dragdrop/os_exchange_data.h", | 165 "dragdrop/os_exchange_data.h", |
| 166 "dragdrop/os_exchange_data_provider_mac.h", | 166 "dragdrop/os_exchange_data_provider_mac.h", |
| 167 "dragdrop/os_exchange_data_provider_mac.mm", | 167 "dragdrop/os_exchange_data_provider_mac.mm", |
| 168 "dragdrop/os_exchange_data_provider_win.cc", | 168 "dragdrop/os_exchange_data_provider_win.cc", |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 432 } | 432 } |
| 433 } | 433 } |
| 434 | 434 |
| 435 if (use_aura) { | 435 if (use_aura) { |
| 436 deps += [ "//ui/events" ] | 436 deps += [ "//ui/events" ] |
| 437 sources += [ "window_tracker_template.h" ] | 437 sources += [ "window_tracker_template.h" ] |
| 438 } else { | 438 } else { |
| 439 sources -= [ | 439 sources -= [ |
| 440 "cursor/cursor.cc", | 440 "cursor/cursor.cc", |
| 441 "cursor/cursor.h", | 441 "cursor/cursor.h", |
| 442 "dragdrop/drag_utils_aura.cc", | |
| 443 ] | 442 ] |
| 444 } | 443 } |
| 445 | 444 |
| 446 if (!use_aura || !is_linux) { | 445 if (!use_aura || !is_linux) { |
| 447 sources -= [ "resource/resource_bundle_auralinux.cc" ] | 446 sources -= [ "resource/resource_bundle_auralinux.cc" ] |
| 448 } | 447 } |
| 449 | 448 |
| 450 if (use_aura && is_win) { | |
| 451 sources -= [ "dragdrop/drag_utils_aura.cc" ] | |
| 452 } | |
| 453 | |
| 454 if (is_linux) { | 449 if (is_linux) { |
| 455 deps += [ "//build/linux:fontconfig" ] | 450 deps += [ "//build/linux:fontconfig" ] |
| 456 } | 451 } |
| 457 | 452 |
| 458 if (use_glib) { | 453 if (use_glib) { |
| 459 configs += [ "//build/config/linux:glib" ] | 454 configs += [ "//build/config/linux:glib" ] |
| 460 } | 455 } |
| 461 | 456 |
| 462 if (is_linux) { | 457 if (is_linux) { |
| 463 if (!toolkit_views && !use_aura) { | 458 if (!toolkit_views && !use_aura) { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 511 ] | 506 ] |
| 512 } | 507 } |
| 513 } | 508 } |
| 514 | 509 |
| 515 if (is_mac) { | 510 if (is_mac) { |
| 516 deps += [ "//third_party/mozilla" ] | 511 deps += [ "//third_party/mozilla" ] |
| 517 | 512 |
| 518 sources -= [ | 513 sources -= [ |
| 519 "cursor/image_cursors.cc", | 514 "cursor/image_cursors.cc", |
| 520 "cursor/image_cursors.h", | 515 "cursor/image_cursors.h", |
| 521 "dragdrop/drag_utils.cc", | |
| 522 "dragdrop/drag_utils.h", | 516 "dragdrop/drag_utils.h", |
|
tapted
2016/05/26 12:31:41
this should be removed too
spqchan
2016/05/27 23:25:48
Done.
| |
| 523 ] | 517 ] |
| 524 | 518 |
| 525 libs += [ | 519 libs += [ |
| 526 "Accelerate.framework", | 520 "Accelerate.framework", |
| 527 "AudioUnit.framework", | 521 "AudioUnit.framework", |
| 528 "Carbon.framework", | 522 "Carbon.framework", |
| 529 "CoreVideo.framework", | 523 "CoreVideo.framework", |
| 530 ] | 524 ] |
| 531 } | 525 } |
| 532 | 526 |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 950 if (is_mac) { | 944 if (is_mac) { |
| 951 mac_framework_bundle("ui_unittests_framework") { | 945 mac_framework_bundle("ui_unittests_framework") { |
| 952 testonly = true | 946 testonly = true |
| 953 deps = [ | 947 deps = [ |
| 954 "//ui/resources:ui_test_pak_bundle_data", | 948 "//ui/resources:ui_test_pak_bundle_data", |
| 955 ] | 949 ] |
| 956 info_plist = "test/framework-Info.plist" | 950 info_plist = "test/framework-Info.plist" |
| 957 output_name = "ui_unittests Framework" | 951 output_name = "ui_unittests Framework" |
| 958 } | 952 } |
| 959 } | 953 } |
| OLD | NEW |