From c692dd33c9a2686d7121045de78e7a0bdfabfe86 Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 2 Apr 2010 22:02:37 +0000 Subject: Eliminate unnecessary dependencies on OpenGL.framework. I'm only making this change for the Mac because I can't test it for other platforms right now, but as a general rule, libraries belong inside link_settings sections, not all_dependent_settings (or both). all_dependent_settings says that anyone that depends on a given target, even transitively through a long chain, inherits the enclsoed settings. In this case, chrome_exe and helper_app would inappropriately be linked against OpenGL.framework, even though they did not need to be. It is enough for chrome_dll to link against OpenGL.framework. For that matter, the non-library uses of all_dependent_settings in this file are probably wrong, too. Generally, they should be replaced with direct_dependent_settings. Inappropriate use of all_dependent_settings results in -Defines and -Includes leaking, and can cause problems for remote downstream targets. BUG=none TEST=otool -L GC.app/Contents/MacOS/GC should not show OpenGL.framework Review URL: http://codereview.chromium.org/1604009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43533 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/gpu.gyp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gpu/gpu.gyp') diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 86c79ff..fac0dee 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -78,12 +78,10 @@ ], [ 'OS=="mac"', { - 'all_dependent_settings': { - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - ], - }, + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', + ], }, }, ], -- cgit v1.1