| 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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 ], | 635 ], |
| 636 }], | 636 }], |
| 637 ['chromeos==1', { | 637 ['chromeos==1', { |
| 638 'dependencies': [ | 638 'dependencies': [ |
| 639 '../chromeos/chromeos.gyp:chromeos', | 639 '../chromeos/chromeos.gyp:chromeos', |
| 640 # Ash #includes power_supply_properties.pb.h directly. | 640 # Ash #includes power_supply_properties.pb.h directly. |
| 641 '../chromeos/chromeos.gyp:power_manager_proto', | 641 '../chromeos/chromeos.gyp:power_manager_proto', |
| 642 ], | 642 ], |
| 643 }, { # else: chromeos!=1 | 643 }, { # else: chromeos!=1 |
| 644 'sources/': [ | 644 'sources/': [ |
| 645 ['exclude', '/chromeos/'], | |
| 646 ['exclude', 'display/output_configurator_animation.cc'], | 645 ['exclude', 'display/output_configurator_animation.cc'], |
| 647 ['exclude', 'display/output_configurator_animation.h'], | 646 ['exclude', 'display/output_configurator_animation.h'], |
| 648 ], | 647 ], |
| 649 }], | 648 }], |
| 650 ], | 649 ], |
| 651 }, | 650 }, |
| 652 | 651 |
| 653 { | 652 { |
| 654 'target_name': 'ash_with_content', | 653 'target_name': 'ash_with_content', |
| 655 'type': '<(component)', | 654 'type': '<(component)', |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1066 }, | 1065 }, |
| 1067 }, | 1066 }, |
| 1068 'dependencies': [ | 1067 'dependencies': [ |
| 1069 '../sandbox/sandbox.gyp:sandbox', | 1068 '../sandbox/sandbox.gyp:sandbox', |
| 1070 ], | 1069 ], |
| 1071 }], | 1070 }], |
| 1072 ], | 1071 ], |
| 1073 }, | 1072 }, |
| 1074 ], | 1073 ], |
| 1075 } | 1074 } |
| OLD | NEW |