diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 01:57:10 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 01:57:10 +0000 |
| commit | fd911dd1acb736447191b7d67ddf67db2c7260ee (patch) | |
| tree | 34575b2e2253290f527eee5d8e885c210320915e /build/all_android.gyp | |
| parent | f87d6dacd3b806d40986ef8bd671b7fd630fef3c (diff) | |
| download | chromium_src-fd911dd1acb736447191b7d67ddf67db2c7260ee.zip chromium_src-fd911dd1acb736447191b7d67ddf67db2c7260ee.tar.gz chromium_src-fd911dd1acb736447191b7d67ddf67db2c7260ee.tar.bz2 | |
android build: progress on content and libjingle.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9271028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all_android.gyp')
| -rw-r--r-- | build/all_android.gyp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 2333441..ae2370c 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -19,7 +19,8 @@ { # The current list of tests for android. This is temporary # until the full set supported. If adding a new test here, - # please also add it to build/android/run_tests.py + # please also add it to build/android/run_tests.py, else the + # test is not run. 'target_name': 'android_builder_tests', 'type': 'none', 'dependencies': [ @@ -27,16 +28,32 @@ '../sql/sql.gyp:sql_unittests', '../ipc/ipc.gyp:ipc_tests', '../net/net.gyp:net_unittests', + # From here down: not added to run_tests.py yet. + '../jingle/jingle.gyp:jingle_unittests', ], }, { - # Experimental / in-progress targets that are expected to fail. + # Experimental / in-progress targets that are expected to fail + # but we still try to compile them on bots (turning the stage + # orange, not red). 'target_name': 'android_experimental', 'type': 'none', 'dependencies': [ '../webkit/webkit.gyp:pull_in_webkit_unit_tests', '../webkit/webkit.gyp:pull_in_DumpRenderTree', - '../chrome/chrome.gyp:unit_tests' + '../chrome/chrome.gyp:unit_tests', + ], + }, + { + # In-progress targets that are expected to fail and are NOT run + # on any bot. + 'target_name': 'android_in_progress', + 'type': 'none', + 'dependencies': [ + '../content/content.gyp:content_browsertests', + '../content/content.gyp:content_unittests', + '../chrome/chrome.gyp:sync_unit_tests', + '../ui/ui.gyp:gfx_unittests', ], }, ], # targets |