| OLD | NEW |
| 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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 ['exclude', 'display/display_change_observer_chromeos.h'], | 667 ['exclude', 'display/display_change_observer_chromeos.h'], |
| 668 ['exclude', 'display/display_error_observer_chromeos.cc'], | 668 ['exclude', 'display/display_error_observer_chromeos.cc'], |
| 669 ['exclude', 'display/display_error_observer_chromeos.h'], | 669 ['exclude', 'display/display_error_observer_chromeos.h'], |
| 670 ], | 670 ], |
| 671 }], | 671 }], |
| 672 ['chromeos==1', { | 672 ['chromeos==1', { |
| 673 'dependencies': [ | 673 'dependencies': [ |
| 674 '../chromeos/chromeos.gyp:chromeos', | 674 '../chromeos/chromeos.gyp:chromeos', |
| 675 # Ash #includes power_supply_properties.pb.h directly. | 675 # Ash #includes power_supply_properties.pb.h directly. |
| 676 '../chromeos/chromeos.gyp:power_manager_proto', | 676 '../chromeos/chromeos.gyp:power_manager_proto', |
| 677 » '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 677 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 678 '../ui/display/display.gyp:display', |
| 678 ], | 679 ], |
| 679 }, { # else: chromeos!=1 | 680 }, { # else: chromeos!=1 |
| 680 'sources/': [ | 681 'sources/': [ |
| 681 ['exclude', 'display/output_configurator_animation.cc'], | 682 ['exclude', 'display/output_configurator_animation.cc'], |
| 682 ['exclude', 'display/output_configurator_animation.h'], | 683 ['exclude', 'display/output_configurator_animation.h'], |
| 683 ['exclude', 'display/resolution_notification_controller.cc'], | 684 ['exclude', 'display/resolution_notification_controller.cc'], |
| 684 ['exclude', 'display/resolution_notification_controller.h'], | 685 ['exclude', 'display/resolution_notification_controller.h'], |
| 685 ], | 686 ], |
| 686 }], | 687 }], |
| 687 ], | 688 ], |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 'sources/': [ | 1013 'sources/': [ |
| 1013 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], | 1014 ['exclude', 'accelerators/magnifier_key_scroller_unittest.cc'], |
| 1014 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], | 1015 ['exclude', 'accelerators/spoken_feedback_toggler_unittest.cc'], |
| 1015 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'], | 1016 ['exclude', 'display/display_change_observer_chromeos_unittest.cc'], |
| 1016 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'], | 1017 ['exclude', 'display/display_error_observer_chromeos_unittest.cc'], |
| 1017 ], | 1018 ], |
| 1018 }], | 1019 }], |
| 1019 ['chromeos==1', { | 1020 ['chromeos==1', { |
| 1020 'dependencies': [ | 1021 'dependencies': [ |
| 1021 '../chromeos/chromeos.gyp:power_manager_proto', | 1022 '../chromeos/chromeos.gyp:power_manager_proto', |
| 1022 » '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1023 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1024 '../ui/display/display.gyp:display', |
| 1023 ], | 1025 ], |
| 1024 'sources': [ | 1026 'sources': [ |
| 1025 'first_run/first_run_helper_unittest.cc', | 1027 'first_run/first_run_helper_unittest.cc', |
| 1026 ], | 1028 ], |
| 1027 }, { # else: chromeos!=1 | 1029 }, { # else: chromeos!=1 |
| 1028 'sources/': [ | 1030 'sources/': [ |
| 1029 ['exclude', 'display/resolution_notification_controller_unittest.cc'
], | 1031 ['exclude', 'display/resolution_notification_controller_unittest.cc'
], |
| 1030 ], | 1032 ], |
| 1031 }], | 1033 }], |
| 1032 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 1034 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1122 }], | 1124 }], |
| 1123 ['chromeos==1', { | 1125 ['chromeos==1', { |
| 1124 'dependencies': [ | 1126 'dependencies': [ |
| 1125 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 1127 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 1126 ], | 1128 ], |
| 1127 }], | 1129 }], |
| 1128 ], | 1130 ], |
| 1129 }, | 1131 }, |
| 1130 ], | 1132 ], |
| 1131 } | 1133 } |
| OLD | NEW |