Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: build/all_android.gyp

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify conditional to make work on non-Android Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/app/content_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index fb3586f361b048f198f8db0f979f065858953fc4..c4d939d03635864f4b5aba6c16791453a8c469da 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
« no previous file with comments | « no previous file | content/app/content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698