diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 10:38:42 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 10:38:42 +0000 |
| commit | 90b54ed25814cc58682e20ad5e8648799143faf6 (patch) | |
| tree | c55c180e4ec55d288c6caba62315d277a399febb /chrome/chrome_common.gypi | |
| parent | 90946b37cecb5958afc62d32f62efaba233b10a2 (diff) | |
| download | chromium_src-90b54ed25814cc58682e20ad5e8648799143faf6.zip chromium_src-90b54ed25814cc58682e20ad5e8648799143faf6.tar.gz chromium_src-90b54ed25814cc58682e20ad5e8648799143faf6.tar.bz2 | |
Fix build with system nspr.
nspr is now used by chrome/common/metrics/metrics_log_base.cc
This is upstreaming Gentoo Linux patch.
BUG=none
Review URL: https://codereview.chromium.org/12061006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index cf2e004..d37e337 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -485,7 +485,12 @@ 'sources/': [ ['exclude', '^common/automation_'] ] - }] + }], + ['use_system_nspr==1', { + 'dependencies': [ + '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', + ], + }], ], 'target_conditions': [ ['OS == "ios"', { |