| 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 # A hook that can be overridden in other repositories to add additional | 7 # A hook that can be overridden in other repositories to add additional |
| 8 # compilation targets to 'All'. Only used on Android. | 8 # compilation targets to 'All'. Only used on Android. |
| 9 'android_app_targets%': [], | 9 'android_app_targets%': [], |
| 10 }, | 10 }, |
| (...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1179 'dependencies': [ | 1179 'dependencies': [ |
| 1180 '../chromeos/chromeos.gyp:chromeos_unittests', | 1180 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 1181 '../athena/main/athena_main.gyp:*', | 1181 '../athena/main/athena_main.gyp:*', |
| 1182 ], | 1182 ], |
| 1183 }], | 1183 }], |
| 1184 ['use_ozone==1', { | 1184 ['use_ozone==1', { |
| 1185 'dependencies': [ | 1185 'dependencies': [ |
| 1186 '../ui/ozone/ozone.gyp:*', | 1186 '../ui/ozone/ozone.gyp:*', |
| 1187 '../ui/ozone/demo/ozone_demos.gyp:*', | 1187 '../ui/ozone/demo/ozone_demos.gyp:*', |
| 1188 ], | 1188 ], |
| 1189 'dependencies!': [ | |
| 1190 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 | |
| 1191 ], | |
| 1192 }], | 1189 }], |
| 1193 ], | 1190 ], |
| 1194 }, | 1191 }, |
| 1195 ], # targets | 1192 ], # targets |
| 1196 }, { | 1193 }, { |
| 1197 'conditions': [ | 1194 'conditions': [ |
| 1198 ['OS=="linux"', { | 1195 ['OS=="linux"', { |
| 1199 # TODO(thakis): Remove this once the linux gtk bot no longer reference
s | 1196 # TODO(thakis): Remove this once the linux gtk bot no longer reference
s |
| 1200 # it (probably after the first aura release on linux), see r249162 | 1197 # it (probably after the first aura release on linux), see r249162 |
| 1201 'targets': [ | 1198 'targets': [ |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1234 'dependencies': [ | 1231 'dependencies': [ |
| 1235 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', | 1232 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', |
| 1236 '../ui/views/views.gyp:views', | 1233 '../ui/views/views.gyp:views', |
| 1237 '../ui/views/views.gyp:views_unittests', | 1234 '../ui/views/views.gyp:views_unittests', |
| 1238 ], | 1235 ], |
| 1239 }, # target_name: macviews_builder | 1236 }, # target_name: macviews_builder |
| 1240 ], # targets | 1237 ], # targets |
| 1241 }], # os=='mac' and toolkit_views==1 | 1238 }], # os=='mac' and toolkit_views==1 |
| 1242 ], # conditions | 1239 ], # conditions |
| 1243 } | 1240 } |
| OLD | NEW |