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: http://src.chromium.org/svn/trunk/src/build@199616 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
jochen@chromium.org 2013-05-11 18:51:45 +00:00
Родитель 4ccaaebf48
Коммит 5f871a785e
2 изменённых файлов: 18 добавлений и 2 удалений

10
all.gyp
Просмотреть файл

@ -61,7 +61,7 @@
'../third_party/ots/ots.gyp:*', '../third_party/ots/ots.gyp:*',
'../third_party/qcms/qcms.gyp:*', '../third_party/qcms/qcms.gyp:*',
'../third_party/re2/re2.gyp:re2', '../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:*', '../v8/tools/gyp/v8.gyp:*',
'../webkit/compositor_bindings/compositor_bindings_tests.gyp:*', '../webkit/compositor_bindings/compositor_bindings_tests.gyp:*',
'../webkit/webkit.gyp:*', '../webkit/webkit.gyp:*',
@ -185,6 +185,14 @@
}], }],
], ],
}, # target_name: All }, # 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', 'target_name': 'All_syzygy',
'type': 'none', 'type': 'none',

Просмотреть файл

@ -28,6 +28,14 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_javalib',
], ],
}, # target_name: All }, # 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 # The current list of tests for android. This is temporary
# until the full set supported. If adding a new test here, # until the full set supported. If adding a new test here,
@ -59,7 +67,7 @@
'../sandbox/sandbox.gyp:sandbox_linux_unittests', '../sandbox/sandbox.gyp:sandbox_linux_unittests',
'../sql/sql.gyp:sql_unittests', '../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests', '../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/android_tools.gyp:android_tools',
'../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor', '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
'../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test', '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',