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