| Index: webrtc/base/base.gyp
|
| diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
|
| index c9090bb5f54571252c200441311c87abbe88436c..6e3b02e5bd08bcd473f3741cb937e1b4c73937c8 100644
|
| --- a/webrtc/base/base.gyp
|
| +++ b/webrtc/base/base.gyp
|
| @@ -215,7 +215,6 @@
|
| 'LOGGING=1',
|
| ],
|
| 'sources': [
|
| - 'applefilesystem.mm',
|
| 'arraysize.h',
|
| 'asyncfile.cc',
|
| 'asyncfile.h',
|
| @@ -264,6 +263,7 @@
|
| 'httpcommon.h',
|
| 'httprequest.cc',
|
| 'httprequest.h',
|
| + 'iosfilesystem.mm',
|
| 'ipaddress.cc',
|
| 'ipaddress.h',
|
| 'linked_ptr.h',
|
| @@ -589,6 +589,19 @@
|
| },
|
| },
|
| },
|
| + 'conditions': [
|
| + ['target_arch=="ia32"', {
|
| + 'all_dependent_settings': {
|
| + 'link_settings': {
|
| + 'xcode_settings': {
|
| + 'OTHER_LDFLAGS': [
|
| + '-framework Carbon',
|
| + ],
|
| + },
|
| + },
|
| + },
|
| + }],
|
| + ],
|
| }],
|
| ['OS=="win" and nacl_untrusted_build==0', {
|
| 'sources': [
|
| @@ -637,6 +650,11 @@
|
| },
|
| }
|
| }],
|
| + ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
|
| + 'defines': [
|
| + 'CARBON_DEPRECATED=YES',
|
| + ],
|
| + }],
|
| ['OS=="linux" or OS=="android"', {
|
| 'sources': [
|
| 'linux.cc',
|
|
|