| 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 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 '../../ipc/ipc.gyp:ipc', | 126 '../../ipc/ipc.gyp:ipc', |
| 127 ], | 127 ], |
| 128 'sources!': [ | 128 'sources!': [ |
| 129 'input_state_lookup.cc', | 129 'input_state_lookup.cc', |
| 130 ], | 130 ], |
| 131 }], | 131 }], |
| 132 ['use_ozone==1', { | 132 ['use_ozone==1', { |
| 133 'dependencies': [ | 133 'dependencies': [ |
| 134 '../events/ozone/events_ozone.gyp:events_ozone', | 134 '../events/ozone/events_ozone.gyp:events_ozone', |
| 135 '../ozone/ozone.gyp:ozone', | 135 '../ozone/ozone.gyp:ozone', |
| 136 '../ozone/ozone.gyp:ozone_base', |
| 136 ], | 137 ], |
| 137 }], | 138 }], |
| 138 ], | 139 ], |
| 139 }, | 140 }, |
| 140 { | 141 { |
| 141 'target_name': 'aura_test_support', | 142 'target_name': 'aura_test_support', |
| 142 'type': 'static_library', | 143 'type': 'static_library', |
| 143 'dependencies': [ | 144 'dependencies': [ |
| 144 '../../skia/skia.gyp:skia', | 145 '../../skia/skia.gyp:skia', |
| 145 '../../testing/gtest.gyp:gtest', | 146 '../../testing/gtest.gyp:gtest', |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 ['OS=="linux" and use_allocator!="none"', { | 294 ['OS=="linux" and use_allocator!="none"', { |
| 294 'dependencies': [ | 295 'dependencies': [ |
| 295 # See http://crbug.com/162998#c4 for why this is needed. | 296 # See http://crbug.com/162998#c4 for why this is needed. |
| 296 '../../base/allocator/allocator.gyp:allocator', | 297 '../../base/allocator/allocator.gyp:allocator', |
| 297 ], | 298 ], |
| 298 }], | 299 }], |
| 299 ], | 300 ], |
| 300 }, | 301 }, |
| 301 ], | 302 ], |
| 302 } | 303 } |
| OLD | NEW |