| 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   'variables': { | 10   'variables': { | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 47         '../media/media.gyp:media_unittests', | 47         '../media/media.gyp:media_unittests', | 
| 48         '../net/net.gyp:net_unittests', | 48         '../net/net.gyp:net_unittests', | 
| 49         '../sql/sql.gyp:sql_unittests', | 49         '../sql/sql.gyp:sql_unittests', | 
| 50         '../sync/sync.gyp:sync_unit_tests', | 50         '../sync/sync.gyp:sync_unit_tests', | 
| 51         '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 51         '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 
| 52         '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s
     tats_monitor', | 52         '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_s
     tats_monitor', | 
| 53         '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | 53         '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | 
| 54         '../tools/android/forwarder2/forwarder.gyp:forwarder2', | 54         '../tools/android/forwarder2/forwarder.gyp:forwarder2', | 
| 55         '../tools/android/md5sum/md5sum.gyp:md5sum', | 55         '../tools/android/md5sum/md5sum.gyp:md5sum', | 
| 56         '../ui/ui.gyp:ui_unittests', | 56         '../ui/ui.gyp:ui_unittests', | 
| 57         # From here down: not added to run_tests.py yet. |  | 
| 58         '../jingle/jingle.gyp:jingle_unittests', |  | 
| 59         # Required by ui_unittests. | 57         # Required by ui_unittests. | 
| 60         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but | 58         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but | 
| 61         # this would cause circular gyp dependency which needs refactoring the | 59         # this would cause circular gyp dependency which needs refactoring the | 
| 62         # gyps to resolve. | 60         # gyps to resolve. | 
| 63         '../chrome/chrome_resources.gyp:packed_resources', | 61         '../chrome/chrome_resources.gyp:packed_resources', | 
| 64       ], | 62       ], | 
| 65       'conditions': [ | 63       'conditions': [ | 
| 66         ['linux_breakpad==1', { | 64         ['linux_breakpad==1', { | 
| 67           'dependencies': [ | 65           'dependencies': [ | 
| 68             '../breakpad/breakpad.gyp:breakpad_unittests', | 66             '../breakpad/breakpad.gyp:breakpad_unittests', | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 107       # In-progress targets that are expected to fail and are NOT run | 105       # In-progress targets that are expected to fail and are NOT run | 
| 108       # on any bot. | 106       # on any bot. | 
| 109       'target_name': 'android_in_progress', | 107       'target_name': 'android_in_progress', | 
| 110       'type': 'none', | 108       'type': 'none', | 
| 111       'dependencies': [ | 109       'dependencies': [ | 
| 112         '../content/content.gyp:content_browsertests', | 110         '../content/content.gyp:content_browsertests', | 
| 113       ], | 111       ], | 
| 114     }, | 112     }, | 
| 115   ],  # targets | 113   ],  # targets | 
| 116 } | 114 } | 
| OLD | NEW | 
|---|