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

Side by Side Diff: ui/base/BUILD.gn

Issue 1394783005: Aura on Android: Idle monitor stub implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream
Patch Set: Forgot a comma in ui_base.gyp. Created 5 years, 2 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 | « no previous file | ui/base/idle/idle_android.cc » ('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 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/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//testing/test.gni") 8 import("//testing/test.gni")
9 9
10 if (is_android) { 10 if (is_android) {
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 "dragdrop/drop_target_win.h", 120 "dragdrop/drop_target_win.h",
121 "dragdrop/os_exchange_data.cc", 121 "dragdrop/os_exchange_data.cc",
122 "dragdrop/os_exchange_data.h", 122 "dragdrop/os_exchange_data.h",
123 "dragdrop/os_exchange_data_provider_mac.h", 123 "dragdrop/os_exchange_data_provider_mac.h",
124 "dragdrop/os_exchange_data_provider_mac.mm", 124 "dragdrop/os_exchange_data_provider_mac.mm",
125 "dragdrop/os_exchange_data_provider_win.cc", 125 "dragdrop/os_exchange_data_provider_win.cc",
126 "dragdrop/os_exchange_data_provider_win.h", 126 "dragdrop/os_exchange_data_provider_win.h",
127 "hit_test.h", 127 "hit_test.h",
128 "idle/idle.cc", 128 "idle/idle.cc",
129 "idle/idle.h", 129 "idle/idle.h",
130 "idle/idle_android.cc",
130 "idle/idle_chromeos.cc", 131 "idle/idle_chromeos.cc",
131 "idle/idle_linux.cc", 132 "idle/idle_linux.cc",
132 "idle/idle_mac.mm", 133 "idle/idle_mac.mm",
133 "idle/idle_win.cc", 134 "idle/idle_win.cc",
134 "ios/cru_context_menu_controller.h", 135 "ios/cru_context_menu_controller.h",
135 "ios/cru_context_menu_controller.mm", 136 "ios/cru_context_menu_controller.mm",
136 "ios/cru_context_menu_holder.h", 137 "ios/cru_context_menu_holder.h",
137 "ios/cru_context_menu_holder.mm", 138 "ios/cru_context_menu_holder.mm",
138 "l10n/formatter.cc", 139 "l10n/formatter.cc",
139 "l10n/formatter.h", 140 "l10n/formatter.h",
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 if (use_aura) { 564 if (use_aura) {
564 if (use_x11) { 565 if (use_x11) {
565 sources += [ "clipboard/clipboard_aurax11.cc" ] 566 sources += [ "clipboard/clipboard_aurax11.cc" ]
566 } else if (!is_win && !is_android) { 567 } else if (!is_win && !is_android) {
567 # This file is used for all non-X11, non-Windows, non-Android aura Builds. 568 # This file is used for all non-X11, non-Windows, non-Android aura Builds.
568 sources += [ "clipboard/clipboard_aura.cc" ] 569 sources += [ "clipboard/clipboard_aura.cc" ]
569 } 570 }
570 } 571 }
571 572
572 if (is_android || is_ios) { 573 if (is_android || is_ios) {
574 sources -= [ "device_form_factor_desktop.cc" ]
575 }
576
577 if ((is_android && !use_aura) || is_ios) {
573 sources -= [ 578 sources -= [
574 "device_form_factor_desktop.cc",
575 "idle/idle.cc", 579 "idle/idle.cc",
576 "idle/idle.h", 580 "idle/idle.h",
581 "idle/idle_android.cc",
577 ] 582 ]
578 } 583 }
579 } 584 }
580 585
581 source_set("test_support") { 586 source_set("test_support") {
582 testonly = true 587 testonly = true
583 sources = [ 588 sources = [
584 "test/material_design_controller_test_api.cc", 589 "test/material_design_controller_test_api.cc",
585 "test/material_design_controller_test_api.h", 590 "test/material_design_controller_test_api.h",
586 "test/ui_controls.h", 591 "test/ui_controls.h",
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 } 883 }
879 if (is_mac) { 884 if (is_mac) {
880 data += [ "$root_out_dir/ui_unittests Framework.framework/" ] 885 data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
881 886
882 if (is_asan && symbol_level == 0) { 887 if (is_asan && symbol_level == 0) {
883 data += [ "$root_out_dir/ui_base_unittests.dSYM/" ] 888 data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
884 } 889 }
885 } 890 }
886 } 891 }
887 # TODO(GYP) Mac (ui_base_tests_bundle) 892 # TODO(GYP) Mac (ui_base_tests_bundle)
OLDNEW
« no previous file with comments | « no previous file | ui/base/idle/idle_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698