summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2009-02-24 00:03:15 +0000
committermark@chromium.org <mark@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af>2009-02-24 00:03:15 +0000
commitc4f1fddcb6d8f5803ae2f3003a173aa2e8b68a75 (patch)
tree24d5fcce803d9671c573ada9251c46b2b6b075fe /samples
parent319d3c023a3deceaf03a4b8e51ebeb58c4e2a934 (diff)
downloadgyp-c4f1fddcb6d8f5803ae2f3003a173aa2e8b68a75.tar.gz
Add ipc_tests and image_diff to chrome.gyp.
git-svn-id: http://gyp.googlecode.com/svn/trunk@279 78cadc50-ecff-11dd-a971-7dbc132099af
Diffstat (limited to 'samples')
-rw-r--r--samples/chrome.gyp41
-rw-r--r--samples/empty.cc0
-rwxr-xr-xsamples/samples1
3 files changed, 42 insertions, 0 deletions
diff --git a/samples/chrome.gyp b/samples/chrome.gyp
index b0bc57be..a58cb5c0 100644
--- a/samples/chrome.gyp
+++ b/samples/chrome.gyp
@@ -60,6 +60,9 @@
'browser/browser_resources.grd',
'common/common_resources.grd',
'renderer/renderer_resources.grd',
+
+ # Compile something so that a library can be generated.
+ 'empty.cc',
],
'hard_dependency': 1,
'direct_dependent_settings': {
@@ -75,11 +78,14 @@
'resources',
'../base/base.gyp:base',
'../base/base.gyp:base_gfx',
+ '../googleurl/build/googleurl.gyp:googleurl',
+ '../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu38/icu38.gyp:icui18n',
'../third_party/icu38/icu38.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
+ '../webkit/webkit.gyp:glue',
],
'include_dirs': [
'..',
@@ -272,6 +278,11 @@
'common/worker_thread_ticker.cc',
'common/worker_thread_ticker.h',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '..',
+ ],
+ },
'conditions': [
['OS!="win"', {
'sources!': [
@@ -1261,5 +1272,35 @@
}],
],
},
+ {
+ 'target_name': 'ipc_tests',
+ 'type': 'executable',
+ 'dependencies': [
+ 'common',
+ '../base/base.gyp:base',
+ '../testing/gtest.gyp:gtest',
+ ],
+ 'sources': [
+ 'common/ipc_fuzzing_tests.cc',
+ 'common/ipc_message_unittest.cc',
+ 'common/ipc_send_fds_test.cc',
+ 'common/ipc_sync_channel_unittest.cc',
+ 'common/ipc_sync_message_unittest.cc',
+ 'common/ipc_sync_message_unittest.h',
+ 'common/ipc_tests.cc',
+ 'common/ipc_tests.h',
+ ],
+ },
+ {
+ 'target_name': 'image_diff',
+ 'type': 'executable',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_gfx',
+ ],
+ 'sources': [
+ 'tools/test/image_diff/image_diff.cc',
+ ],
+ },
],
}
diff --git a/samples/empty.cc b/samples/empty.cc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/samples/empty.cc
diff --git a/samples/samples b/samples/samples
index 6bac8dc1..bb6dc04b 100755
--- a/samples/samples
+++ b/samples/samples
@@ -12,6 +12,7 @@ gyps = [
'build/external_code.gypi',
'chrome/test/security_tests/security_tests.gyp',
'chrome/chrome.gyp',
+ 'chrome/empty.cc',
'googleurl/build/googleurl.gyp',
'net/net.gyp',
'sdch/sdch.gyp',