summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-13 09:27:20 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-13 09:27:20 +0000
commitac73cdf13add8b5d83a8c3e07066529f576efbe3 (patch)
tree21258523b72702609b738ab30ac2e0a888620086 /extensions
parentd00adbb0bb92b24ccf96252ae966d9336dec4df9 (diff)
downloadchromium_src-ac73cdf13add8b5d83a8c3e07066529f576efbe3.zip
chromium_src-ac73cdf13add8b5d83a8c3e07066529f576efbe3.tar.gz
chromium_src-ac73cdf13add8b5d83a8c3e07066529f576efbe3.tar.bz2
Fix linkage of components/keyed_service.
After https://codereview.chromium.org/306293006, "policy_component" depends on "bookmarks_browser" which depends on "keyed_service_core". On a windows component build this fails to link, because "policy_component" and "keyed_service_core" are shared libraries but "bookmarks_browser" is static. The linker then gets confused due to the inlined virtuals. This change makes the KeyedService methods non-inline so that they get symbols defined in the "keyed_service_core" dll, which fixes the build. TBR=blundell@chromium.org BUG=None Review URL: https://codereview.chromium.org/330643004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/extensions.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index 43b3eb3..cd191ce 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -229,6 +229,7 @@
'type': 'static_library',
'dependencies': [
'../components/components.gyp:keyed_service_content',
+ '../components/components.gyp:keyed_service_core',
'../components/components.gyp:pref_registry',
'../components/components.gyp:usb_service',
'../content/content.gyp:content_browser',