| 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 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'chromeos_tools.gypi' | 10 'chromeos_memory.gypi', |
| 11 'chromeos_tools.gypi', |
| 11 ], | 12 ], |
| 12 'targets': [ | 13 'targets': [ |
| 13 { | 14 { |
| 14 'target_name': 'chromeos', | 15 'target_name': 'chromeos', |
| 15 'type': '<(component)', | 16 'type': '<(component)', |
| 16 'dependencies': [ | 17 'dependencies': [ |
| 17 '../base/base.gyp:base', | 18 '../base/base.gyp:base', |
| 18 '../base/base.gyp:base_prefs', | 19 '../base/base.gyp:base_prefs', |
| 19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 20 '../build/linux/system.gyp:dbus', | 21 '../build/linux/system.gyp:dbus', |
| (...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 '../third_party/cros_system_api/dbus/video_activity_update.proto', | 559 '../third_party/cros_system_api/dbus/video_activity_update.proto', |
| 559 ], | 560 ], |
| 560 'variables': { | 561 'variables': { |
| 561 'proto_in_dir': '../third_party/cros_system_api/dbus/', | 562 'proto_in_dir': '../third_party/cros_system_api/dbus/', |
| 562 'proto_out_dir': 'chromeos/dbus', | 563 'proto_out_dir': 'chromeos/dbus', |
| 563 }, | 564 }, |
| 564 'includes': ['../build/protoc.gypi'], | 565 'includes': ['../build/protoc.gypi'], |
| 565 }, | 566 }, |
| 566 ], | 567 ], |
| 567 } | 568 } |
| OLD | NEW |