Index: pylib/gyp/input.py |
diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py |
index eaf8ea0c3aef5897daf5b8d377cce1b5a1289f43..faabf786dde855e942104f8c7e3e52d70953381c 100644 |
--- a/pylib/gyp/input.py |
+++ b/pylib/gyp/input.py |
@@ -1672,7 +1672,14 @@ class DependencyGraphNode(object): |
Returns a list of dependency targets whose link_settings should be merged |
into this target. |
""" |
- return self._LinkDependenciesInternal(targets, False) |
+ |
+ # TODO(sbaig) Currently, chrome depends on the bug that shared libraries' |
+ # link_settings are propagated. So for now, we will allow it, unless the |
+ # 'allow_sharedlib_linksettings_propagation' flag is explicitly set to |
+ # False. Once chrome is fixed, we can remove this flag. |
+ include_shared_libraries = \ |
+ targets[self.ref].get('allow_sharedlib_linksettings_propagation', True) |
+ return self._LinkDependenciesInternal(targets, include_shared_libraries) |
def DependenciesToLinkAgainst(self, targets): |
""" |