| 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 17 matching lines...) Expand all Loading... |
| 28 # on tryserver triggers and load. Discuss with jrg please. | 28 # on tryserver triggers and load. Discuss with jrg please. |
| 29 'target_name': 'android_builder_tests', | 29 'target_name': 'android_builder_tests', |
| 30 'type': 'none', | 30 'type': 'none', |
| 31 'dependencies': [ | 31 'dependencies': [ |
| 32 '../base/base.gyp:base_unittests', | 32 '../base/base.gyp:base_unittests', |
| 33 '../chrome/chrome.gyp:sync_unit_tests', | 33 '../chrome/chrome.gyp:sync_unit_tests', |
| 34 '../content/content.gyp:content_unittests', | 34 '../content/content.gyp:content_unittests', |
| 35 '../sql/sql.gyp:sql_unittests', | 35 '../sql/sql.gyp:sql_unittests', |
| 36 '../ipc/ipc.gyp:ipc_tests', | 36 '../ipc/ipc.gyp:ipc_tests', |
| 37 '../net/net.gyp:net_unittests', | 37 '../net/net.gyp:net_unittests', |
| 38 '../ui/ui.gyp:ui_unittests', |
| 38 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 39 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', |
| 39 # From here down: not added to run_tests.py yet. | 40 # From here down: not added to run_tests.py yet. |
| 40 '../jingle/jingle.gyp:jingle_unittests', | 41 '../jingle/jingle.gyp:jingle_unittests', |
| 41 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | 42 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', |
| 42 '../tools/android/forwarder/forwarder.gyp:forwarder', | 43 '../tools/android/forwarder/forwarder.gyp:forwarder', |
| 43 '../media/media.gyp:media_unittests', | 44 '../media/media.gyp:media_unittests', |
| 44 ], | 45 ], |
| 45 }, | 46 }, |
| 46 { | 47 { |
| 47 # Experimental / in-progress targets that are expected to fail | 48 # Experimental / in-progress targets that are expected to fail |
| (...skipping 10 matching lines...) Expand all Loading... |
| 58 'target_name': 'android_in_progress', | 59 'target_name': 'android_in_progress', |
| 59 'type': 'none', | 60 'type': 'none', |
| 60 'dependencies': [ | 61 'dependencies': [ |
| 61 '../content/content.gyp:content_browsertests', | 62 '../content/content.gyp:content_browsertests', |
| 62 '../chrome/chrome.gyp:unit_tests', | 63 '../chrome/chrome.gyp:unit_tests', |
| 63 '../ui/ui.gyp:gfx_unittests', | 64 '../ui/ui.gyp:gfx_unittests', |
| 64 ], | 65 ], |
| 65 }, | 66 }, |
| 66 ], # targets | 67 ], # targets |
| 67 } | 68 } |
| OLD | NEW |