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

Unified Diff: chrome/chrome_tests.gypi

Issue 8689001: Reland 111519: Remove default plug-in on Mac, Gtk and Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 1 month 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 | « chrome/chrome_common.gypi ('k') | chrome/default_plugin/default_plugin.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a1a4179b698a54883aa45285c06cd49218821cf4..c233d058dbf18b68d6d9d5fc276f2ca2402cc281 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -734,7 +734,6 @@
'../third_party/icu/icu.gyp:icuuc',
'../third_party/libxml/libxml.gyp:libxml',
# run time dependencies
- 'default_plugin/default_plugin.gyp:default_plugin',
'../ppapi/ppapi_internal.gyp:ppapi_tests',
'../third_party/mesa/mesa.gyp:osmesa',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
@@ -843,6 +842,7 @@
'sources!': [
'test/automation/automation_proxy_uitest.cc',
'test/ui/npapi_uitest.cc',
+ 'browser/default_plugin_uitest.cc',
],
'dependencies': [
'../ui/aura/aura.gyp:aura',
@@ -874,6 +874,12 @@
'<(allocator_target)',
],
}],
+ ['use_aura==0', {
+ 'dependencies': [
+ # Runtime dependency
+ 'default_plugin/default_plugin.gyp:default_plugin',
+ ]
+ }],
],
'link_settings': {
'libraries': [
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/default_plugin/default_plugin.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698