summaryrefslogtreecommitdiffstats
path: root/content/content_plugin.gypi
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 15:41:52 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 15:41:52 +0000
commit9783633cf08b9e029cb8226ee6ea2a8eef0d46f7 (patch)
tree6f2e82a91f8b58288aa62629ae259b5939eda69d /content/content_plugin.gypi
parentab30b683cd22fd3310e80bac168e2346a0fde276 (diff)
downloadchromium_src-9783633cf08b9e029cb8226ee6ea2a8eef0d46f7.zip
chromium_src-9783633cf08b9e029cb8226ee6ea2a8eef0d46f7.tar.gz
chromium_src-9783633cf08b9e029cb8226ee6ea2a8eef0d46f7.tar.bz2
Fix up compositor mocking.
Two changes: a) detangle the mock compositor from compositor_test_support a) pull in compositor when using a mock compositor Rationale: a) this target was meant to support using use_webkit_compositor=1 when WK isn't initialized; sometimes we will want to use the mock compositor when WK is initialized b) we can imagine scenarios where we want to switch between mock and real compositors in the same executable, and it's one less target to update BUG=101477 TEST=bots stay green Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107563 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=107564 Review URL: http://codereview.chromium.org/8395043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_plugin.gypi')
-rw-r--r--content/content_plugin.gypi7
1 files changed, 7 insertions, 0 deletions
diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi
index 22532b9..734c497 100644
--- a/content/content_plugin.gypi
+++ b/content/content_plugin.gypi
@@ -54,5 +54,12 @@
],
},
}],
+ ['use_aura==1 and OS!="win"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lXext',
+ ],
+ },
+ }],
],
}