| 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 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1174 '../sync/sync.gyp:sync_unit_tests', | 1174 '../sync/sync.gyp:sync_unit_tests', |
| 1175 ], | 1175 ], |
| 1176 }], | 1176 }], |
| 1177 ['chromeos==1', { | 1177 ['chromeos==1', { |
| 1178 'dependencies': [ | 1178 'dependencies': [ |
| 1179 '../chromeos/chromeos.gyp:chromeos_unittests', | 1179 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 1180 '../athena/main/athena_main.gyp:*', | 1180 '../athena/main/athena_main.gyp:*', |
| 1181 ], | 1181 ], |
| 1182 }], | 1182 }], |
| 1183 ['use_ozone==1', { | 1183 ['use_ozone==1', { |
| 1184 'dependencies': [ |
| 1185 '../ui/ozone/ozone.gyp:*', |
| 1186 ], |
| 1184 'dependencies!': [ | 1187 'dependencies!': [ |
| 1185 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 | 1188 '../chrome/chrome.gyp:interactive_ui_tests', # crbug.com/362166 |
| 1186 ], | 1189 ], |
| 1187 }], | 1190 }], |
| 1188 ], | 1191 ], |
| 1189 }, | 1192 }, |
| 1190 ], # targets | 1193 ], # targets |
| 1191 }, { | 1194 }, { |
| 1192 'conditions': [ | 1195 'conditions': [ |
| 1193 ['OS=="linux"', { | 1196 ['OS=="linux"', { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 1216 # http://crbug.com/157234 | 1219 # http://crbug.com/157234 |
| 1217 #'../chrome/chrome.gyp:sync_integration_tests_run', | 1220 #'../chrome/chrome.gyp:sync_integration_tests_run', |
| 1218 '../chrome/chrome.gyp:unit_tests_run', | 1221 '../chrome/chrome.gyp:unit_tests_run', |
| 1219 '../net/net.gyp:net_unittests_run', | 1222 '../net/net.gyp:net_unittests_run', |
| 1220 ], | 1223 ], |
| 1221 }, # target_name: chromium_swarm_tests | 1224 }, # target_name: chromium_swarm_tests |
| 1222 ], | 1225 ], |
| 1223 }], | 1226 }], |
| 1224 ], # conditions | 1227 ], # conditions |
| 1225 } | 1228 } |
| OLD | NEW |