summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-08 22:12:44 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-08 22:12:44 +0000
commit01651e6f4349b80390493c181df91a3c7b7d2171 (patch)
treeca41deb688a348bc56119c42c227cee2b2be5db5 /net/net.gyp
parent76e80f16f492580ba42293902ef3a56034a477fb (diff)
downloadchromium_src-01651e6f4349b80390493c181df91a3c7b7d2171.zip
chromium_src-01651e6f4349b80390493c181df91a3c7b7d2171.tar.gz
chromium_src-01651e6f4349b80390493c181df91a3c7b7d2171.tar.bz2
Get file extension synonyms from the OS, fix so that if one synonym is safe they all are.
BUG=126088 TEST=as in bug Review URL: https://chromiumcodereview.appspot.com/10379011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp
index a78e5ed..ebad7cb9 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -212,7 +212,7 @@
'base/platform_mime_util.h',
# TODO(tc): gnome-vfs? xdgmime? /etc/mime.types?
'base/platform_mime_util_linux.cc',
- 'base/platform_mime_util_mac.cc',
+ 'base/platform_mime_util_mac.mm',
'base/platform_mime_util_win.cc',
'base/prioritized_dispatcher.cc',
'base/prioritized_dispatcher.h',
@@ -976,6 +976,7 @@
],
'link_settings': {
'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Security.framework',
'$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
'$(SDKROOT)/usr/lib/libresolv.dylib',