Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1108)

Unified Diff: content/content_shell.gypi

Issue 120683005: content: Copy AHEM font to its final destination path. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add more missing commas Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index e8b3a7c8d770b29b49b70547a17dcaf1c4231a75..94867fc13aa9ec8f3ec3f6e9fd58d978f011a226 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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698