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

Side by Side Diff: ash/ash.gyp

Issue 183853010: Bluetooth: notify user of incoming pairing requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add dependency to hopefully fix linux_chromeos build failure Created 6 years, 9 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 | « ash/DEPS ('k') | ash/ash_chromeos_strings.grdp » ('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 'chromium_code': 1, 7 'chromium_code': 1,
8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 'system/bluetooth/tray_bluetooth.cc', 281 'system/bluetooth/tray_bluetooth.cc',
282 'system/bluetooth/tray_bluetooth.h', 282 'system/bluetooth/tray_bluetooth.h',
283 'system/brightness_control_delegate.h', 283 'system/brightness_control_delegate.h',
284 'system/chromeos/audio/audio_detailed_view.cc', 284 'system/chromeos/audio/audio_detailed_view.cc',
285 'system/chromeos/audio/audio_detailed_view.h', 285 'system/chromeos/audio/audio_detailed_view.h',
286 'system/chromeos/audio/tray_audio_chromeos.cc', 286 'system/chromeos/audio/tray_audio_chromeos.cc',
287 'system/chromeos/audio/tray_audio_chromeos.h', 287 'system/chromeos/audio/tray_audio_chromeos.h',
288 'system/chromeos/audio/tray_audio_delegate_chromeos.cc', 288 'system/chromeos/audio/tray_audio_delegate_chromeos.cc',
289 'system/chromeos/audio/tray_audio_delegate_chromeos.h', 289 'system/chromeos/audio/tray_audio_delegate_chromeos.h',
290 'system/chromeos/enterprise/enterprise_domain_observer.h', 290 'system/chromeos/enterprise/enterprise_domain_observer.h',
291 'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
292 'system/chromeos/bluetooth/bluetooth_notification_controller.h',
291 'system/chromeos/brightness/brightness_controller_chromeos.cc', 293 'system/chromeos/brightness/brightness_controller_chromeos.cc',
292 'system/chromeos/brightness/brightness_controller_chromeos.h', 294 'system/chromeos/brightness/brightness_controller_chromeos.h',
293 'system/chromeos/brightness/tray_brightness.cc', 295 'system/chromeos/brightness/tray_brightness.cc',
294 'system/chromeos/brightness/tray_brightness.h', 296 'system/chromeos/brightness/tray_brightness.h',
295 'system/chromeos/enterprise/tray_enterprise.h', 297 'system/chromeos/enterprise/tray_enterprise.h',
296 'system/chromeos/enterprise/tray_enterprise.cc', 298 'system/chromeos/enterprise/tray_enterprise.cc',
297 'system/chromeos/keyboard_brightness_controller.cc', 299 'system/chromeos/keyboard_brightness_controller.cc',
298 'system/chromeos/keyboard_brightness_controller.h', 300 'system/chromeos/keyboard_brightness_controller.h',
299 'system/chromeos/label_tray_view.h', 301 'system/chromeos/label_tray_view.h',
300 'system/chromeos/label_tray_view.cc', 302 'system/chromeos/label_tray_view.cc',
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 ['exclude', 'display/display_change_observer_chromeos.h'], 662 ['exclude', 'display/display_change_observer_chromeos.h'],
661 ['exclude', 'display/display_error_observer_chromeos.cc'], 663 ['exclude', 'display/display_error_observer_chromeos.cc'],
662 ['exclude', 'display/display_error_observer_chromeos.h'], 664 ['exclude', 'display/display_error_observer_chromeos.h'],
663 ], 665 ],
664 }], 666 }],
665 ['chromeos==1', { 667 ['chromeos==1', {
666 'dependencies': [ 668 'dependencies': [
667 '../chromeos/chromeos.gyp:chromeos', 669 '../chromeos/chromeos.gyp:chromeos',
668 # Ash #includes power_supply_properties.pb.h directly. 670 # Ash #includes power_supply_properties.pb.h directly.
669 '../chromeos/chromeos.gyp:power_manager_proto', 671 '../chromeos/chromeos.gyp:power_manager_proto',
672 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
670 ], 673 ],
671 }, { # else: chromeos!=1 674 }, { # else: chromeos!=1
672 'sources/': [ 675 'sources/': [
673 ['exclude', 'display/output_configurator_animation.cc'], 676 ['exclude', 'display/output_configurator_animation.cc'],
674 ['exclude', 'display/output_configurator_animation.h'], 677 ['exclude', 'display/output_configurator_animation.h'],
675 ['exclude', 'display/resolution_notification_controller.cc'], 678 ['exclude', 'display/resolution_notification_controller.cc'],
676 ['exclude', 'display/resolution_notification_controller.h'], 679 ['exclude', 'display/resolution_notification_controller.h'],
677 ], 680 ],
678 }], 681 }],
679 ], 682 ],
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 'sources/': [ 1005 'sources/': [
1003 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], 1006 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'],
1004 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], 1007 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'],
1005 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'], 1008 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'],
1006 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'], 1009 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'],
1007 ], 1010 ],
1008 }], 1011 }],
1009 ['chromeos==1', { 1012 ['chromeos==1', {
1010 'dependencies': [ 1013 'dependencies': [
1011 '../chromeos/chromeos.gyp:power_manager_proto', 1014 '../chromeos/chromeos.gyp:power_manager_proto',
1015 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1012 ], 1016 ],
1013 'sources': [ 1017 'sources': [
1014 'first_run/first_run_helper_unittest.cc', 1018 'first_run/first_run_helper_unittest.cc',
1015 ], 1019 ],
1016 }, { # else: chromeos!=1 1020 }, { # else: chromeos!=1
1017 'sources/': [ 1021 'sources/': [
1018 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1022 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1019 ], 1023 ],
1020 }], 1024 }],
1021 ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1' , { 1025 ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1' , {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 ['OS=="win"', { 1105 ['OS=="win"', {
1102 'msvs_settings': { 1106 'msvs_settings': {
1103 'VCLinkerTool': { 1107 'VCLinkerTool': {
1104 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1108 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1105 }, 1109 },
1106 }, 1110 },
1107 'dependencies': [ 1111 'dependencies': [
1108 '../sandbox/sandbox.gyp:sandbox', 1112 '../sandbox/sandbox.gyp:sandbox',
1109 ], 1113 ],
1110 }], 1114 }],
1115 ['chromeos==1', {
1116 'dependencies': [
1117 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1118 ],
1119 }],
1111 ], 1120 ],
1112 }, 1121 },
1113 ], 1122 ],
1114 } 1123 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/ash_chromeos_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698