diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 04:11:56 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 04:11:56 +0000 |
| commit | 0e9e40293244c1e0d5c845efee2f642bb6559b63 (patch) | |
| tree | df72ee819decc3aaef2c1736716a77aef51cce81 /chrome_frame | |
| parent | ec2f688a0ea9bb4e4cb17575bc39e16cf5b4bb06 (diff) | |
| download | chromium_src-0e9e40293244c1e0d5c845efee2f642bb6559b63.zip chromium_src-0e9e40293244c1e0d5c845efee2f642bb6559b63.tar.gz chromium_src-0e9e40293244c1e0d5c845efee2f642bb6559b63.tar.bz2 | |
Get rid of the dependency of a number of chrome frame projects on the xulrunner_sdk target
which brings in dependency on nspr needlessly.
BUG=43461
TEST=it compiles
Review URL: http://codereview.chromium.org/5931001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 081bf6f..75d028b 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -152,6 +152,7 @@ 'chrome_frame_privileged_mock', 'chrome_frame_strings', 'chrome_tab_idl', + 'xulrunner_sdk', ], 'sources': [ 'chrome_tab.h', @@ -188,6 +189,9 @@ 'urlmon_upload_data_stream_unittest.cc', 'vtable_patch_manager_unittest.cc', ], + 'include_dirs': [ + '<@(xul_include_directories)', + ], 'resource_include_dirs': [ '<(INTERMEDIATE_DIR)', '<(SHARED_INTERMEDIATE_DIR)', @@ -200,7 +204,6 @@ ['coverage==0', { 'dependencies': [ 'chrome_frame_npapi', - 'xulrunner_sdk', ], 'sources': [ 'chrome_frame_npapi_unittest.cc', @@ -273,7 +276,6 @@ 'chrome_frame_utils', 'chrome_tab_idl', 'npchrome_frame', - 'xulrunner_sdk', ], 'sources': [ '../base/test_suite.h', @@ -432,7 +434,6 @@ 'msvs_settings': { 'VCLinkerTool': { 'IgnoreDefaultLibraryNames': ['nspr.lib', 'nspr4.lib'], - 'DelayLoadDLLs': ['nspr4.dll'], }, }, 'dependencies': [ @@ -688,7 +689,6 @@ 'chrome_frame_strings', 'chrome_frame_utils', '../chrome/chrome.gyp:common', - 'xulrunner_sdk', ], 'sources': [ 'chrome_frame_npapi.cc', @@ -707,6 +707,9 @@ 'ns_isupports_impl.h', 'scoped_ns_ptr_win.h', ], + 'include_dirs': [ + '<@(xul_include_directories)', + ], }, { 'target_name': 'chrome_frame_strings', |