| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 # TODO(tfarina): This is a layer violation and should be removed. | 274 # TODO(tfarina): This is a layer violation and should be removed. |
| 275 # crbug.com/176960 | 275 # crbug.com/176960 |
| 276 # For now this is here as a temporary band-aid to fix the clobber | 276 # For now this is here as a temporary band-aid to fix the clobber |
| 277 # issue we are seeing when running this target on Android. | 277 # issue we are seeing when running this target on Android. |
| 278 # crbug.com/374490 | 278 # crbug.com/374490 |
| 279 '../../chrome/chrome_resources.gyp:packed_resources', | 279 '../../chrome/chrome_resources.gyp:packed_resources', |
| 280 'ui_base_unittests', | 280 'ui_base_unittests', |
| 281 ], | 281 ], |
| 282 'variables': { | 282 'variables': { |
| 283 'test_suite_name': 'ui_base_unittests', | 283 'test_suite_name': 'ui_base_unittests', |
| 284 'isolate_file': 'ui_base_tests.isolate', |
| 284 }, | 285 }, |
| 285 'includes': [ '../../build/apk_test.gypi' ], | 286 'includes': [ '../../build/apk_test.gypi' ], |
| 286 }, | 287 }, |
| 287 ], | 288 ], |
| 288 }], | 289 }], |
| 289 ['test_isolation_mode != "noop"', { | 290 ['test_isolation_mode != "noop"', { |
| 290 'targets': [ | 291 'targets': [ |
| 291 { | 292 { |
| 292 'target_name': 'ui_base_unittests_run', | 293 'target_name': 'ui_base_unittests_run', |
| 293 'type': 'none', | 294 'type': 'none', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 305 'dependencies': [ | 306 'dependencies': [ |
| 306 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 307 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 307 ], | 308 ], |
| 308 }], | 309 }], |
| 309 ], | 310 ], |
| 310 }, | 311 }, |
| 311 ], | 312 ], |
| 312 }], | 313 }], |
| 313 ], | 314 ], |
| 314 } | 315 } |
| OLD | NEW |