Index: webrtc/base/base.gyp |
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp |
index 6e3b02e5bd08bcd473f3741cb937e1b4c73937c8..2fc7d556848c59e16a7498843f846a46b598b78c 100644 |
--- a/webrtc/base/base.gyp |
+++ b/webrtc/base/base.gyp |
@@ -263,7 +263,7 @@ |
'httpcommon.h', |
'httprequest.cc', |
'httprequest.h', |
- 'iosfilesystem.mm', |
+ 'applefilesystem.mm', |
magjed_webrtc
2016/09/01 10:18:34
nit: This should be put in alphabetical order.
|
'ipaddress.cc', |
'ipaddress.h', |
'linked_ptr.h', |
@@ -589,19 +589,6 @@ |
}, |
}, |
}, |
- 'conditions': [ |
- ['target_arch=="ia32"', { |
- 'all_dependent_settings': { |
- 'link_settings': { |
- 'xcode_settings': { |
- 'OTHER_LDFLAGS': [ |
- '-framework Carbon', |
- ], |
- }, |
- }, |
- }, |
- }], |
- ], |
}], |
['OS=="win" and nacl_untrusted_build==0', { |
'sources': [ |
@@ -650,11 +637,6 @@ |
}, |
} |
}], |
- ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', { |
- 'defines': [ |
- 'CARBON_DEPRECATED=YES', |
- ], |
- }], |
['OS=="linux" or OS=="android"', { |
'sources': [ |
'linux.cc', |