Chromium Code Reviews| 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 22 matching lines...) Expand all Loading... | |
| 33 '../content/content.gyp:content_unittests', | 33 '../content/content.gyp:content_unittests', |
| 34 '../sql/sql.gyp:sql_unittests', | 34 '../sql/sql.gyp:sql_unittests', |
| 35 '../ipc/ipc.gyp:ipc_tests', | 35 '../ipc/ipc.gyp:ipc_tests', |
| 36 '../net/net.gyp:net_unittests', | 36 '../net/net.gyp:net_unittests', |
| 37 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', | 37 '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', |
| 38 # From here down: not added to run_tests.py yet. | 38 # From here down: not added to run_tests.py yet. |
| 39 '../jingle/jingle.gyp:jingle_unittests', | 39 '../jingle/jingle.gyp:jingle_unittests', |
| 40 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', | 40 '../tools/android/fake_dns/fake_dns.gyp:fake_dns', |
| 41 '../tools/android/forwarder/forwarder.gyp:forwarder', | 41 '../tools/android/forwarder/forwarder.gyp:forwarder', |
| 42 '../media/media.gyp:media_unittests', | 42 '../media/media.gyp:media_unittests', |
| 43 '../testing/android/native_test.gyp:native_test_apk' | |
| 44 ], | |
| 45 'conditions': [ | |
| 46 ['"<(gtest_target_type)"=="shared_library"', { | |
| 47 'dependencies': [ | |
| 48 # The first item is simply the template. We add as a dep | |
| 49 # to make sure it builds in ungenerated form. TODO(jrg): | |
| 50 # once stable, transition to a test-only (optional) | |
| 51 # target. | |
| 52 '../testing/android/native_test.gyp:native_test_apk', | |
|
Yaron
2012/04/12 01:29:53
Wait, but why is this needed if you've already spe
John Grabowski
2012/04/13 01:11:37
oops... shouldn't be above yet
| |
| 53 # Unit test bundles packaged as an apk. | |
| 54 '../base/base.gyp:base_unittests_apk', | |
| 55 '../ipc/ipc.gyp:ipc_tests_apk', | |
| 56 ], | |
| 57 }] | |
| 43 ], | 58 ], |
| 44 }, | 59 }, |
| 45 { | 60 { |
| 46 # Experimental / in-progress targets that are expected to fail | 61 # Experimental / in-progress targets that are expected to fail |
| 47 # but we still try to compile them on bots (turning the stage | 62 # but we still try to compile them on bots (turning the stage |
| 48 # orange, not red). | 63 # orange, not red). |
| 49 'target_name': 'android_experimental', | 64 'target_name': 'android_experimental', |
| 50 'type': 'none', | 65 'type': 'none', |
| 51 'dependencies': [ | 66 'dependencies': [ |
| 52 ], | 67 ], |
| 53 }, | 68 }, |
| 54 { | 69 { |
| 55 # In-progress targets that are expected to fail and are NOT run | 70 # In-progress targets that are expected to fail and are NOT run |
| 56 # on any bot. | 71 # on any bot. |
| 57 'target_name': 'android_in_progress', | 72 'target_name': 'android_in_progress', |
| 58 'type': 'none', | 73 'type': 'none', |
| 59 'dependencies': [ | 74 'dependencies': [ |
| 60 '../content/content.gyp:content_browsertests', | 75 '../content/content.gyp:content_browsertests', |
| 61 '../chrome/chrome.gyp:unit_tests', | 76 '../chrome/chrome.gyp:unit_tests', |
| 62 '../ui/ui.gyp:gfx_unittests', | 77 '../ui/ui.gyp:gfx_unittests', |
| 63 ], | 78 ], |
| 64 }, | 79 }, |
| 65 ], # targets | 80 ], # targets |
| 66 } | 81 } |
| OLD | NEW |