diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-19 07:39:33 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-19 07:39:33 +0000 |
| commit | d981b2f485e9a065e69adc14abf4085c1ec3128d (patch) | |
| tree | 28193f032cc2775e6757ef358ec9d106bf96df93 | |
| parent | 126d937b48e5d84399e4050f48daeb560291fb19 (diff) | |
| download | chromium_src-d981b2f485e9a065e69adc14abf4085c1ec3128d.zip chromium_src-d981b2f485e9a065e69adc14abf4085c1ec3128d.tar.gz chromium_src-d981b2f485e9a065e69adc14abf4085c1ec3128d.tar.bz2 | |
Fix checkdeps failure and Linux shared dbg-shlib build.
TBR=avi
Review URL: http://codereview.chromium.org/6543033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75491 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/DEPS | 7 | ||||
| -rw-r--r-- | content/content_browser.gypi | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/content/DEPS b/content/DEPS index fb297a3..bd39303 100644 --- a/content/DEPS +++ b/content/DEPS @@ -9,15 +9,22 @@ include_rules = [ "+chrome", "+grit", + "+media", "+net", + "+ppapi", + "+printing", + "+skia", # Don't allow inclusion of these other libs we shouldn't be calling directly. "-v8", "-tools", + "+third_party/npapi/bindings", + "+third_party/sqlite", # Allow inclusion of WebKit API files. "+third_party/WebKit/Source/WebKit/chromium", "+ui", + "+views", "+webkit", ] diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 82085d1..62620f8 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -139,6 +139,8 @@ }], ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'dependencies': [ + # For FcLangSetAdd call in render_sandbox_host_linux.cc + '../build/linux/system.gyp:fontconfig', '../build/linux/system.gyp:gtk', ], }], |