summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-16 09:12:59 +0000
committerkaiwang@chromium.org <kaiwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-16 09:12:59 +0000
commit71abef6ed363864e518b5323350bd17ff6fa5b2e (patch)
tree369e9bcb8617b4f429439260cfb0d27c96e7640b
parent121cc751fa5b8a7c4190342d12afc84284d2bf7b (diff)
downloadchromium_src-71abef6ed363864e518b5323350bd17ff6fa5b2e.zip
chromium_src-71abef6ed363864e518b5323350bd17ff6fa5b2e.tar.gz
chromium_src-71abef6ed363864e518b5323350bd17ff6fa5b2e.tar.bz2
Add content_renderer and content_gpu to the dependency list of content_browser
BUG=170190 Review URL: https://chromiumcodereview.appspot.com/11948003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177113 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/content.gyp11
1 files changed, 10 insertions, 1 deletions
diff --git a/content/content.gyp b/content/content.gyp
index 0d011da..cb1f23b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -88,7 +88,16 @@
'content_browser.gypi',
],
'dependencies': [
- 'content_common', 'content_resources.gyp:content_resources',
+ 'content_common',
+ 'content_resources.gyp:content_resources',
+ ],
+ 'conditions': [
+ ['OS != "ios"', {
+ 'dependencies': [
+ 'content_gpu',
+ 'content_renderer',
+ ],
+ }],
],
},
{