| 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 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | |
| 38 '../tools/android/forwarder/forwarder.gyp:forwarder', | |
| 39 ], | 37 ], |
| 40 }, | 38 }, |
| 41 { | 39 { |
| 42 # Experimental / in-progress targets that are expected to fail | 40 # Experimental / in-progress targets that are expected to fail |
| 43 # but we still try to compile them on bots (turning the stage | 41 # but we still try to compile them on bots (turning the stage |
| 44 # orange, not red). | 42 # orange, not red). |
| 45 'target_name': 'android_experimental', | 43 'target_name': 'android_experimental', |
| 46 'type': 'none', | 44 'type': 'none', |
| 47 'dependencies': [ | 45 'dependencies': [ |
| 48 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 46 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', |
| 49 '../webkit/webkit.gyp:pull_in_DumpRenderTree', | 47 '../webkit/webkit.gyp:pull_in_DumpRenderTree', |
| 50 '../chrome/chrome.gyp:unit_tests', | 48 '../chrome/chrome.gyp:unit_tests', |
| 51 ], | 49 ], |
| 52 }, | 50 }, |
| 53 { | 51 { |
| 54 # In-progress targets that are expected to fail and are NOT run | 52 # In-progress targets that are expected to fail and are NOT run |
| 55 # on any bot. | 53 # on any bot. |
| 56 'target_name': 'android_in_progress', | 54 'target_name': 'android_in_progress', |
| 57 'type': 'none', | 55 'type': 'none', |
| 58 'dependencies': [ | 56 'dependencies': [ |
| 59 '../content/content.gyp:content_browsertests', | 57 '../content/content.gyp:content_browsertests', |
| 60 '../content/content.gyp:content_unittests', | 58 '../content/content.gyp:content_unittests', |
| 61 '../chrome/chrome.gyp:sync_unit_tests', | 59 '../chrome/chrome.gyp:sync_unit_tests', |
| 62 '../ui/ui.gyp:gfx_unittests', | 60 '../ui/ui.gyp:gfx_unittests', |
| 63 ], | 61 ], |
| 64 }, | 62 }, |
| 65 ], # targets | 63 ], # targets |
| 66 } | 64 } |
| OLD | NEW |