diff options
author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 21:24:57 +0000 |
---|---|---|
committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-27 21:24:57 +0000 |
commit | ecfea0075665d57802ffd8f5897cf815f310f2d6 (patch) | |
tree | 8f78e87b59697710800dd0d7d1d2ae03da2caa02 /o3d/plugin | |
parent | f07adba7b2cf2eb355c104431f58ce991e0b81fb (diff) | |
download | chromium_src-ecfea0075665d57802ffd8f5897cf815f310f2d6.zip chromium_src-ecfea0075665d57802ffd8f5897cf815f310f2d6.tar.gz chromium_src-ecfea0075665d57802ffd8f5897cf815f310f2d6.tar.bz2 |
o3d plugin was mistakenly being built as a static library when built outside of chrome.
This was preventing the installer from baking it in.
BUG=None
TEST=None
TBR=gspencer
Review URL: http://codereview.chromium.org/173591
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r-- | o3d/plugin/plugin.gyp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 3ed29cd..f0ea4c6 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -208,16 +208,7 @@ }, { 'variables': { - 'conditions': [ - ['OS == "mac"', - { - 'o3d_main_lib_type': 'loadable_module', - }, - { - 'o3d_main_lib_type': 'static_library', - }, - ], - ], + 'o3d_main_lib_type': 'loadable_module', }, }, ], |