diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 23:30:13 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 23:30:13 +0000 |
| commit | 7a77f43ea383500a0463f1a6776ad4af9dc8340e (patch) | |
| tree | e52683f8a697c329ae6bc3224dac3c0fef97f06d /build/all_android.gyp | |
| parent | 3297132a8851a2ab4ed84fa18ff4a6e4c25bd30d (diff) | |
| download | chromium_src-7a77f43ea383500a0463f1a6776ad4af9dc8340e.zip chromium_src-7a77f43ea383500a0463f1a6776ad4af9dc8340e.tar.gz chromium_src-7a77f43ea383500a0463f1a6776ad4af9dc8340e.tar.bz2 | |
Switch android fyi builder to actually build the "android_experimental" target.
Also updates that target with in process build targets and disables a
failing test.
BUG=113487
TEST=
Review URL: http://codereview.chromium.org/9433007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122905 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all_android.gyp')
| -rw-r--r-- | build/all_android.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 0d05590..2ff1785 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -47,9 +47,8 @@ 'dependencies': [ '../webkit/webkit.gyp:pull_in_webkit_unit_tests', '../webkit/webkit.gyp:pull_in_DumpRenderTree', - '../chrome/chrome.gyp:unit_tests', - # Requires 64-bit linker. '../content/content.gyp:content_unittests', + '../chrome/chrome.gyp:browser', ], }, { @@ -60,6 +59,7 @@ 'dependencies': [ '../content/content.gyp:content_browsertests', '../chrome/chrome.gyp:sync_unit_tests', + '../chrome/chrome.gyp:unit_tests', '../ui/ui.gyp:gfx_unittests', ], }, |