| 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 # This is all.gyp file for Android to prevent breakage in Android and other | 5 # This is all.gyp file for Android to prevent breakage in Android and other | 
| 6 # platform; It will be churning a lot in the short term and eventually be merged | 6 # platform; It will be churning a lot in the short term and eventually be merged | 
| 7 # into all.gyp. | 7 # into all.gyp. | 
| 8 | 8 | 
| 9 { | 9 { | 
| 10   'targets': [ | 10   'targets': [ | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
| 27       # on tryserver triggers and load.  Discuss with jrg please. | 27       # on tryserver triggers and load.  Discuss with jrg please. | 
| 28       'target_name': 'android_builder_tests', | 28       'target_name': 'android_builder_tests', | 
| 29       'type': 'none', | 29       'type': 'none', | 
| 30       'dependencies': [ | 30       'dependencies': [ | 
| 31         '../base/base.gyp:base_unittests', | 31         '../base/base.gyp:base_unittests', | 
| 32         '../sql/sql.gyp:sql_unittests', | 32         '../sql/sql.gyp:sql_unittests', | 
| 33         '../ipc/ipc.gyp:ipc_tests', | 33         '../ipc/ipc.gyp:ipc_tests', | 
| 34         '../net/net.gyp:net_unittests', | 34         '../net/net.gyp:net_unittests', | 
| 35         # From here down: not added to run_tests.py yet. | 35         # From here down: not added to run_tests.py yet. | 
| 36         '../jingle/jingle.gyp:jingle_unittests', | 36         '../jingle/jingle.gyp:jingle_unittests', | 
|  | 37         # Workaround of crbug.com/109763. | 
|  | 38         # TODO(wangxianzhu): Enable them in the next CL. | 
|  | 39         # '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | 
|  | 40         # '../tools/android/forwarder/forwarder.gyp:forwarder', | 
| 37       ], | 41       ], | 
| 38     }, | 42     }, | 
| 39     { | 43     { | 
| 40       # Experimental / in-progress targets that are expected to fail | 44       # Experimental / in-progress targets that are expected to fail | 
| 41       # but we still try to compile them on bots (turning the stage | 45       # but we still try to compile them on bots (turning the stage | 
| 42       # orange, not red). | 46       # orange, not red). | 
| 43       'target_name': 'android_experimental', | 47       'target_name': 'android_experimental', | 
| 44       'type': 'none', | 48       'type': 'none', | 
| 45       'dependencies': [ | 49       'dependencies': [ | 
| 46         '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 50         '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 
| 47         '../webkit/webkit.gyp:pull_in_DumpRenderTree', | 51         '../webkit/webkit.gyp:pull_in_DumpRenderTree', | 
| 48         '../chrome/chrome.gyp:unit_tests', | 52         '../chrome/chrome.gyp:unit_tests', | 
| 49       ], | 53       ], | 
| 50     }, | 54     }, | 
| 51     { | 55     { | 
| 52       # In-progress targets that are expected to fail and are NOT run | 56       # In-progress targets that are expected to fail and are NOT run | 
| 53       # on any bot. | 57       # on any bot. | 
| 54       'target_name': 'android_in_progress', | 58       'target_name': 'android_in_progress', | 
| 55       'type': 'none', | 59       'type': 'none', | 
| 56       'dependencies': [ | 60       'dependencies': [ | 
| 57         '../content/content.gyp:content_browsertests', | 61         '../content/content.gyp:content_browsertests', | 
| 58         '../content/content.gyp:content_unittests', | 62         '../content/content.gyp:content_unittests', | 
| 59         '../chrome/chrome.gyp:sync_unit_tests', | 63         '../chrome/chrome.gyp:sync_unit_tests', | 
| 60         '../ui/ui.gyp:gfx_unittests', | 64         '../ui/ui.gyp:gfx_unittests', | 
| 61       ], | 65       ], | 
| 62     }, | 66     }, | 
| 63   ],  # targets | 67   ],  # targets | 
| 64 } | 68 } | 
| OLD | NEW | 
|---|