| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 67             '../ipc/ipc.gyp:ipc_tests_apk', | 67             '../ipc/ipc.gyp:ipc_tests_apk', | 
| 68             '../media/media.gyp:media_unittests_apk', | 68             '../media/media.gyp:media_unittests_apk', | 
| 69             '../net/net.gyp:net_unittests_apk', | 69             '../net/net.gyp:net_unittests_apk', | 
| 70             '../sql/sql.gyp:sql_unittests_apk', | 70             '../sql/sql.gyp:sql_unittests_apk', | 
| 71             '../sync/sync.gyp:sync_unit_tests_apk', | 71             '../sync/sync.gyp:sync_unit_tests_apk', | 
| 72             '../ui/ui.gyp:ui_unittests_apk', | 72             '../ui/ui.gyp:ui_unittests_apk', | 
| 73           ], | 73           ], | 
| 74         }] | 74         }] | 
| 75       ], | 75       ], | 
| 76     }, | 76     }, | 
| 77     { | 77     { | 
| 78       # Experimental / in-progress targets that are expected to fail | 78       # Experimental / in-progress targets that are expected to fail | 
| 79       # but we still try to compile them on bots (turning the stage | 79       # but we still try to compile them on bots (turning the stage | 
| 80       # orange, not red). | 80       # orange, not red). | 
| 81       'target_name': 'android_experimental', | 81       'target_name': 'android_experimental', | 
| 82       'type': 'none', | 82       'type': 'none', | 
| 83       'dependencies': [ | 83       'dependencies': [], | 
| 84         '../chrome/chrome.gyp:unit_tests', |  | 
| 85       ], |  | 
| 86     }, | 84     }, | 
| 87     { | 85     { | 
| 88       # In-progress targets that are expected to fail and are NOT run | 86       # In-progress targets that are expected to fail and are NOT run | 
| 89       # on any bot. | 87       # on any bot. | 
| 90       'target_name': 'android_in_progress', | 88       'target_name': 'android_in_progress', | 
| 91       'type': 'none', | 89       'type': 'none', | 
| 92       'dependencies': [ | 90       'dependencies': [ | 
| 93         '../android_webview/lib/android_webview.gyp:libwebview', | 91         '../android_webview/lib/android_webview.gyp:libwebview', | 
| 94         '../content/content.gyp:content_browsertests', | 92         '../content/content.gyp:content_browsertests', | 
| 95       ], | 93       ], | 
| 96     }, | 94     }, | 
| 97   ],  # targets | 95   ],  # targets | 
| 98 } | 96 } | 
| OLD | NEW | 
|---|