diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 13:53:28 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 13:53:28 +0000 |
| commit | 80efb7f177ed43e9950360be1bf27f9aa9f1ea0b (patch) | |
| tree | 0f15c5f2aff9a15dc8abf61e1bf75d3b219e081f /build | |
| parent | 9e7d44557703aa9f313436dc843a11dbfcb47a57 (diff) | |
| download | chromium_src-80efb7f177ed43e9950360be1bf27f9aa9f1ea0b.zip chromium_src-80efb7f177ed43e9950360be1bf27f9aa9f1ea0b.tar.gz chromium_src-80efb7f177ed43e9950360be1bf27f9aa9f1ea0b.tar.bz2 | |
Include the WebKit targets on all Android builds
Promote DumpRenderTree and webkit_unit_tests to targets being part of All (thus
out of experimental), while also adding TestWebKitAPI by correctly referring to
WebKit's All.gyp instead of (the seemingly Windows-oriented) webkit/webkit.gyp.
After this change, three new targets will be build for Android on the main
waterfall. The compile time for new required files (they all rely heavily on
webkit.a) is negligible, link time is more significant, namely ~40 seconds per
target, but this will be parallelized on the bot with other targets. Increase
in build time is ~50 seconds on my T3500.
BUG=
TEST=DumpRenderTree, webkit_unit_tests and TestWebKitAPI should be build on the
Android buildbots.
Review URL: http://codereview.chromium.org/9701070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all_android.gyp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 809ef1d..bcfd435 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -34,6 +34,7 @@ '../sql/sql.gyp:sql_unittests', '../ipc/ipc.gyp:ipc_tests', '../net/net.gyp:net_unittests', + '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', # From here down: not added to run_tests.py yet. '../jingle/jingle.gyp:jingle_unittests', '../tools/android/fake_dns/fake_dns.gyp:fake_dns', @@ -48,8 +49,6 @@ 'target_name': 'android_experimental', 'type': 'none', 'dependencies': [ - '../webkit/webkit.gyp:pull_in_webkit_unit_tests', - '../webkit/webkit.gyp:pull_in_DumpRenderTree', ], }, { |