diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 23:02:36 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 23:02:36 +0000 |
| commit | 058420ec1126c373ad12b3de52dfaf4a0698db38 (patch) | |
| tree | 4633406561bff52393b825f9bf29f731a9f2df90 /chrome/chrome_tests.gypi | |
| parent | 2a7da0fe044447c231f12a5b0a619bcde6e8ced9 (diff) | |
| download | chromium_src-058420ec1126c373ad12b3de52dfaf4a0698db38.zip chromium_src-058420ec1126c373ad12b3de52dfaf4a0698db38.tar.gz chromium_src-058420ec1126c373ad12b3de52dfaf4a0698db38.tar.bz2 | |
Make plugin_tests compile on Mac/Linux.
BUG=28716
TEST=none
Review URL: http://codereview.chromium.org/1761003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45370 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 8c9a965..e0982c8 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1865,6 +1865,39 @@ }], ], }, + { + 'target_name': 'plugin_tests', + 'type': 'executable', + 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', + 'dependencies': [ + 'chrome_resources', + 'chrome_strings', + 'test_support_common', + 'test_support_ui', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + '../third_party/libxml/libxml.gyp:libxml', + '../third_party/libxslt/libxslt.gyp:libxslt', + '../third_party/npapi/npapi.gyp:npapi', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + 'test/plugin/plugin_test.cpp', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '<(allocator_target)', + 'security_tests', # run time dependency + ], + 'include_dirs': [ + '<(DEPTH)/third_party/wtl/include', + ], + },], + ], + }, ], 'conditions': [ ['OS!="mac"', { @@ -1938,37 +1971,6 @@ ['OS=="win"', { 'targets': [ { - 'target_name': 'plugin_tests', - 'type': 'executable', - 'msvs_guid': 'A1CAA831-C507-4B2E-87F3-AEC63C9907F9', - 'dependencies': [ - 'chrome_resources', - 'chrome_strings', - 'security_tests', # run time dependency - 'test_support_common', - 'test_support_ui', - '../skia/skia.gyp:skia', - '../testing/gtest.gyp:gtest', - '../third_party/libxml/libxml.gyp:libxml', - '../third_party/libxslt/libxslt.gyp:libxslt', - '../third_party/npapi/npapi.gyp:npapi', - ], - 'include_dirs': [ - '..', - '<(DEPTH)/third_party/wtl/include', - ], - 'sources': [ - 'test/plugin/plugin_test.cpp', - ], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - '<(allocator_target)', - ], - },], - ], - }, - { 'target_name': 'security_tests', 'type': 'shared_library', 'msvs_guid': 'E750512D-FC7C-4C98-BF04-0A0DAF882055', |