diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 02:49:58 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 02:49:58 +0000 |
| commit | e389c4745e5d13a204930b0d9915f6eb6bf014d4 (patch) | |
| tree | 6e05c9688fd7b53c1450f109df840ed2de832918 /webkit/glue | |
| parent | 41374f19479aac9d7f505ac6b1f8866d6db6711e (diff) | |
| download | chromium_src-e389c4745e5d13a204930b0d9915f6eb6bf014d4.zip chromium_src-e389c4745e5d13a204930b0d9915f6eb6bf014d4.tar.gz chromium_src-e389c4745e5d13a204930b0d9915f6eb6bf014d4.tar.bz2 | |
cut a bunch of dependencies from browser->blink when in chrome_multiple_dll
Cuts number of gyp paths from chrome.dll -> blink from ~2000 to 113. The remaining paths are via ppapi\ppapi_internal.gyp which I'm not sure what to do with yet.
This is intended as a relatively temporary measure so that chrome_multiple_dll=1 has the dependency structure that we want (no browser <-> child) with link errors so we can see what work remains.
This CL causes the link errors below in chrome_multiple_dll=1. I think these will be fixed by jam@s moving of webkit/plugins/ppapi into content.
content_common.lib(content_common.pepper_plugin_info.obj) : error LNK2019: unresolved external symbol "public: __thiscall webkit::ppapi::PluginModule::EntryPoints::EntryPoints(void)" (??0EntryPoints@PluginModule@ppapi@webkit@@QAE@XZ) referenced in function "public: __thiscall content::PepperPluginInfo::PepperPluginInfo(void)" (??0PepperPluginInfo@content@@QAE@XZ)
content_common.lib(content_common.pepper_plugin_registry.obj) : error LNK2019: unresolved external symbol "public: __thiscall webkit::ppapi::PluginModule::~PluginModule(void)" (??1PluginModule@ppapi@webkit@@QAE@XZ) referenced in function "public: void * __thiscall webkit::ppapi::PluginModule::`scalar deleting destructor'(unsigned int)" (??_GPluginModule@ppapi@webkit@@QAEPAXI@Z)
content_common.lib(content_common.pepper_plugin_registry.obj) : error LNK2019: unresolved external symbol "public: bool __thiscall webkit::ppapi::PluginModule::InitAsLibrary(class base::FilePath const &)" (?InitAsLibrary@PluginModule@ppapi@webkit@@QAE_NABVFilePath@base@@@Z) referenced in function "private: __thiscall content::PepperPluginRegistry::PepperPluginRegistry(void)" (??0PepperPluginRegistry@content@@AAE@XZ)
content_common.lib(content_common.pepper_plugin_registry.obj) : error LNK2019: unresolved external symbol "public: bool __thiscall webkit::ppapi::PluginModule::InitAsInternalPlugin(struct webkit::ppapi::PluginModule::EntryPoints const &)" (?InitAsInternalPlugin@PluginModule@ppapi@webkit@@QAE_NABUEntryPoints@123@@Z) referenced in function "private: __thiscall content::PepperPluginRegistry::PepperPluginRegistry(void)" (??0PepperPluginRegistry@content@@AAE@XZ)
content_common.lib(content_common.pepper_plugin_registry.obj) : error LNK2019: unresolved external symbol "public: __thiscall webkit::ppapi::PluginModule::PluginModule(class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > const &,class base::FilePath const &,class webkit::ppapi::PluginDelegate::ModuleLifetime *,class ppapi::PpapiPermissions const &)" (??0PluginModule@ppapi@webkit@@QAE@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@ABVFilePath@base@@PAVModuleLifetime@PluginDelegate@12@ABVPpapiPermissions@1@@Z) referenced in function "private: __thiscall content::PepperPluginRegistry::PepperPluginRegistry(void)" (??0PepperPluginRegistry@content@@AAE@XZ)
TBR=jam@chromium.org
R=jamesr@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/19784010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 953e3e0..2c88b76 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -130,7 +130,6 @@ '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/printing/printing.gyp:printing', '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', @@ -199,6 +198,11 @@ }], ], }], + ['chrome_multiple_dll!=1', { + 'dependencies': [ + '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', + ], + }], ], }, ], |