diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 02:34:53 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-10 02:34:53 +0000 |
| commit | 6b911a3b842cc2cc0e79b4628a407aa2018af4dc (patch) | |
| tree | 822503067e86224fc0a5bc43ef52cc716af2116a /content/content_shell.gypi | |
| parent | 799f1ec6fdca0336bb558336e4c21d58a1d4d513 (diff) | |
| download | chromium_src-6b911a3b842cc2cc0e79b4628a407aa2018af4dc.zip chromium_src-6b911a3b842cc2cc0e79b4628a407aa2018af4dc.tar.gz chromium_src-6b911a3b842cc2cc0e79b4628a407aa2018af4dc.tar.bz2 | |
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
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 52 |
1 files changed, 51 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 38c58e1..a011233 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -47,7 +47,7 @@ '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', '../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', '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', @@ -286,10 +286,18 @@ '../build/linux/system.gyp:fontconfig', ], }], + ['use_x11 == 1', { + 'dependencies': [ + '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', + ], + }], ['OS=="android"', { 'dependencies': [ 'content_shell_jni_headers', ], + 'dependencies!': [ + '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugin', + ], }, { # else: OS!="android" 'dependencies': [ # This dependency is for running DRT against the content shell, and @@ -340,6 +348,12 @@ ['exclude', 'shell/browser/shell_views.cc'], ], }], # 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', { 'dependencies': [ '../chromeos/chromeos.gyp:chromeos', @@ -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', |