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

Unified Diff: webkit/tools/test_shell/test_shell.gyp

Issue 42340: Update the gyp Linux build: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 | « third_party/libxml/libxml.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell.gyp
===================================================================
--- webkit/tools/test_shell/test_shell.gyp (revision 12226)
+++ webkit/tools/test_shell/test_shell.gyp (working copy)
@@ -86,6 +86,7 @@
'test_shell_resources',
'npapi_layout_test_plugin',
'npapi_test_plugin',
+ '../../../build/linux/system.gyp:gtk',
],
# for: test_shell_gtk.cc
'cflags': ['-Wno-multichar'],
@@ -160,6 +161,7 @@
'conditions': [
['OS=="linux"', {
'dependencies': [
+ '../../../build/linux/system.gyp:gtk',
'../../../net/net.gyp:net_resources',
'../../webkit.gyp:glue', # for webkit_{resources,strings_en-US}.pak
'test_shell_resources',
@@ -261,6 +263,9 @@
],
'conditions': [
['OS=="linux"', {
+ 'dependencies': [
+ '../../../build/linux/system.gyp:gtk',
+ ],
'sources!': [
# TODO(port)
'../../../skia/ext/platform_canvas_unittest.cc',
@@ -348,6 +353,9 @@
'../../glue/plugins/test/plugin_test.cc',
'../../glue/plugins/test/plugin_window_size_test.cc',
],
+ 'include_dirs': [
+ '../../..',
+ ],
'conditions': [
['OS=="linux"', {
'sources!': [
@@ -374,6 +382,9 @@
'../npapi_layout_test_plugin/PluginObject.cpp',
'../npapi_layout_test_plugin/TestObject.cpp',
],
+ 'include_dirs': [
+ '../../..',
+ ],
'dependencies': [
'../../../third_party/npapi/npapi.gyp:npapi',
'../../webkit.gyp:wtf',
« no previous file with comments | « third_party/libxml/libxml.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698