Commit 6b911a3b authored by tfarina@chromium.org's avatar tfarina@chromium.org

content: Migrate everything from TestRunner_resources over content_shell.

This copies the necessary fonts and add the necessary dependencies to get rid of blink_test_runner.gyp dep.

BUG=331303
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/120683005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244052 0039d316-1c4b-4281-b951-d872f2087c98
parent 799f1ec6
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
'../net/net.gyp:net_resources', '../net/net.gyp:net_resources',
'../skia/skia.gyp:skia', '../skia/skia.gyp:skia',
'../third_party/WebKit/public/blink.gyp:blink', '../third_party/WebKit/public/blink.gyp:blink',
'../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner_resources', '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin',
'../third_party/WebKit/public/blink_test_runner.gyp:blink_test_support', '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_support',
'../ui/events/events.gyp:events_base', '../ui/events/events.gyp:events_base',
'../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx',
...@@ -286,10 +286,18 @@ ...@@ -286,10 +286,18 @@
'../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:fontconfig',
], ],
}], }],
['use_x11 == 1', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
['OS=="android"', { ['OS=="android"', {
'dependencies': [ 'dependencies': [
'content_shell_jni_headers', 'content_shell_jni_headers',
], ],
'dependencies!': [
'../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin',
],
}, { # else: OS!="android" }, { # else: OS!="android"
'dependencies': [ 'dependencies': [
# This dependency is for running DRT against the content shell, and # This dependency is for running DRT against the content shell, and
...@@ -340,6 +348,12 @@ ...@@ -340,6 +348,12 @@
['exclude', 'shell/browser/shell_views.cc'], ['exclude', 'shell/browser/shell_views.cc'],
], ],
}], # use_aura==1 }], # use_aura==1
# The test plugin relies on X11.
['OS=="linux" and use_x11==0', {
'dependencies!': [
'../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin',
],
}],
['chromeos==1', { ['chromeos==1', {
'dependencies': [ 'dependencies': [
'../chromeos/chromeos.gyp:chromeos', '../chromeos/chromeos.gyp:chromeos',
...@@ -377,6 +391,42 @@ ...@@ -377,6 +391,42 @@
], ],
}, },
], ],
'conditions': [
['OS=="win"', {
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': ['shell/renderer/test_runner/resources/fonts/AHEM____.TTF'],
}],
}],
['OS=="mac"', {
'all_dependent_settings': {
'mac_bundle_resources': [
'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
'<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
'<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
],
},
}],
['use_x11 == 1', {
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': [
'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
'shell/renderer/test_runner/resources/fonts/fonts.conf',
]
}],
}],
['OS=="android"', {
'copies': [{
'destination': '<(PRODUCT_DIR)',
'files': [
'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
'shell/renderer/test_runner/resources/fonts/android_main_fonts.xml',
'shell/renderer/test_runner/resources/fonts/android_fallback_fonts.xml',
]
}],
}],
],
}, },
{ {
'target_name': 'generate_content_shell_resources', 'target_name': 'generate_content_shell_resources',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment