diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 18:51:45 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-11 18:51:45 +0000 |
| commit | a2d48b22bce42a2f00cb64d50f3ceda84ef30b2e (patch) | |
| tree | 80d009a8c029e2318da9dbbfcbb69aea444103ca /build | |
| parent | 56f6f9dc5522435534cebcf0a1a9a239dbda2bea (diff) | |
| download | chromium_src-a2d48b22bce42a2f00cb64d50f3ceda84ef30b2e.zip chromium_src-a2d48b22bce42a2f00cb64d50f3ceda84ef30b2e.tar.gz chromium_src-a2d48b22bce42a2f00cb64d50f3ceda84ef30b2e.tar.bz2 | |
Add a target all_webkit that depends on the old all_webkit and content_shell
BUG=111316
R=abarth@chromium.org
Review URL: https://codereview.chromium.org/14807005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 10 | ||||
| -rw-r--r-- | build/all_android.gyp | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index d9176a1..264ede7 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -61,7 +61,7 @@ '../third_party/ots/ots.gyp:*', '../third_party/qcms/qcms.gyp:*', '../third_party/re2/re2.gyp:re2', - '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', + '../third_party/WebKit/public/all.gyp:*', '../v8/tools/gyp/v8.gyp:*', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:*', '../webkit/webkit.gyp:*', @@ -186,6 +186,14 @@ ], }, # target_name: All { + 'target_name': 'all_webkit', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/public/all.gyp:all_blink', + '../content/content.gyp:content_shell', + ], + }, # target_name: all_webkit + { 'target_name': 'All_syzygy', 'type': 'none', 'conditions': [ diff --git a/build/all_android.gyp b/build/all_android.gyp index a257751..d6350b3 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -29,6 +29,14 @@ ], }, # target_name: All { + 'target_name': 'all_webkit', + 'type': 'none', + 'dependencies': [ + '../third_party/WebKit/public/all.gyp:all_blink', + '../content/content.gyp:content_shell_apk', + ], + }, # target_name: all_webkit + { # 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, else the @@ -59,7 +67,7 @@ '../sandbox/sandbox.gyp:sandbox_linux_unittests', '../sql/sql.gyp:sql_unittests', '../sync/sync.gyp:sync_unit_tests', - '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*', + '../third_party/WebKit/public/all.gyp:*', '../tools/android/android_tools.gyp:android_tools', '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor', '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', |