diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 18:54:19 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 18:54:19 +0000 |
| commit | e4aa290bc7113c8ed53edc94837ba59df1cce800 (patch) | |
| tree | 14d8b1ec925eaa14d0a37fb020af6bd6941f4c64 /chrome/chrome_installer.gypi | |
| parent | 0e5a13aa0e667d34f893cb04d7c07db2153a733a (diff) | |
| download | chromium_src-e4aa290bc7113c8ed53edc94837ba59df1cce800.zip chromium_src-e4aa290bc7113c8ed53edc94837ba59df1cce800.tar.gz chromium_src-e4aa290bc7113c8ed53edc94837ba59df1cce800.tar.bz2 | |
Support for loading libpeerconnection dynamically instead of statically.
This means that instead of using shared_library as the target type for
libpeerconnection, we'll support loadable_module. This fixes issues with
test binaries that would otherwise unnecessarily depend on libpeerconnection
in shared builds.
The renderer now loads and initializes the module just before initializing the sandbox.
I'm also enabling logging in the module since we can now do that after the process CommandLine instance has been initialized.
The output directory on linux is now always the lib/ subfolder of the build directory. This is so that FILES.cfg and installer scripts will find it reliably. Make builds would previuosly put it in lib.target/ whereas ninja already used lib/. (lib/ is also the folder the installer will use)
BUG=232402,233173,235379,235380
R=jam@chromium.org, jln@chromium.org, mark@chromium.org, ronghuawu@chromium.org
Review URL: https://codereview.chromium.org/14021012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index e8d5679..55dd4c8 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -588,9 +588,9 @@ '<(PRODUCT_DIR)/libpdf.so', ], }], - ['libpeer_target_type=="shared_library"', { + ['libpeer_target_type!="static_library"', { 'packaging_files_binaries': [ - '<(SHARED_LIB_DIR)/libpeerconnection.so', + '<(PRODUCT_DIR)/lib/libpeerconnection.so', ], }], ], |