diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:18:12 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 21:18:12 +0000 |
| commit | 6c5b9f9df3d703adf1cd76b69b86d87d80215fc9 (patch) | |
| tree | f26930b199f6c595e91e22168811cbf2315291b3 /chrome/chrome_tests.gypi | |
| parent | 7a99970fadb988cb50e8de96bb4159ab308c007f (diff) | |
| download | chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.zip chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.tar.gz chromium_src-6c5b9f9df3d703adf1cd76b69b86d87d80215fc9.tar.bz2 | |
Revert "Copy the npapi pepper test plugin during the build so we don't"
This reverts commit r55235.
Review URL: http://codereview.chromium.org/3090020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55287 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index a4f3b99..e57f88c 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -343,8 +343,8 @@ # http://code.google.com/p/chromium/issues/detail?id=18337 ['target_arch!="x64" and target_arch!="arm"', { 'dependencies': [ - '../webkit/webkit.gyp:copy_npapi_test_plugin', - '../webkit/webkit.gyp:copy_npapi_pepper_test_plugin', + '../webkit/webkit.gyp:npapi_test_plugin', + '../webkit/webkit.gyp:npapi_pepper_test_plugin', '../third_party/mesa/mesa.gyp:osmesa', ], }], @@ -518,7 +518,7 @@ '../google_update/google_update.gyp:google_update', '../views/views.gyp:views', # run time dependency - '../webkit/webkit.gyp:copy_npapi_test_plugin', + '../webkit/webkit.gyp:npapi_test_plugin', ], 'conditions': [ ['win_use_allocator_shim==1', { @@ -585,7 +585,7 @@ 'test_support_common', '../google_update/google_update.gyp:google_update', # run time dependency - '../webkit/webkit.gyp:copy_npapi_test_plugin', + '../webkit/webkit.gyp:npapi_test_plugin', ], 'conditions': [ ['win_use_allocator_shim==1', { |