| 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 28 matching lines...) Expand all Loading... |
| 39 { | 39 { |
| 40 # Experimental / in-progress targets that are expected to fail | 40 # Experimental / in-progress targets that are expected to fail |
| 41 # 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 |
| 42 # orange, not red). | 42 # orange, not red). |
| 43 'target_name': 'android_experimental', | 43 'target_name': 'android_experimental', |
| 44 'type': 'none', | 44 'type': 'none', |
| 45 'dependencies': [ | 45 'dependencies': [ |
| 46 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 46 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', |
| 47 '../webkit/webkit.gyp:pull_in_DumpRenderTree', | 47 '../webkit/webkit.gyp:pull_in_DumpRenderTree', |
| 48 '../chrome/chrome.gyp:unit_tests', | 48 '../chrome/chrome.gyp:unit_tests', |
| 49 # Requires 64-bit linker. |
| 50 '../content/content.gyp:content_unittests', |
| 49 ], | 51 ], |
| 50 }, | 52 }, |
| 51 { | 53 { |
| 52 # In-progress targets that are expected to fail and are NOT run | 54 # In-progress targets that are expected to fail and are NOT run |
| 53 # on any bot. | 55 # on any bot. |
| 54 'target_name': 'android_in_progress', | 56 'target_name': 'android_in_progress', |
| 55 'type': 'none', | 57 'type': 'none', |
| 56 'dependencies': [ | 58 'dependencies': [ |
| 57 '../content/content.gyp:content_browsertests', | 59 '../content/content.gyp:content_browsertests', |
| 58 '../content/content.gyp:content_unittests', | |
| 59 '../chrome/chrome.gyp:sync_unit_tests', | 60 '../chrome/chrome.gyp:sync_unit_tests', |
| 60 '../ui/ui.gyp:gfx_unittests', | 61 '../ui/ui.gyp:gfx_unittests', |
| 61 ], | 62 ], |
| 62 }, | 63 }, |
| 63 ], # targets | 64 ], # targets |
| 64 } | 65 } |
| OLD | NEW |