Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Unified Diff: webrtc/base/base.gyp

Issue 2299633002: Remove all reference to carbon api (Closed)
Patch Set: Fix chromium build errors Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/applefilesystem.mm ('k') | webrtc/base/iosfilesystem.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 93f87b2957760cb3d5f2417c3955bd76a87b3a40..9baecd6802c0906614f9bdff70bf2612c5f7f2a4 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -229,6 +229,7 @@
'LOGGING=1',
],
'sources': [
+ 'applefilesystem.mm',
'arraysize.h',
'asyncfile.cc',
'asyncfile.h',
@@ -277,7 +278,6 @@
'httpcommon.h',
'httprequest.cc',
'httprequest.h',
- 'iosfilesystem.mm',
'ipaddress.cc',
'ipaddress.h',
'linked_ptr.h',
@@ -603,19 +603,6 @@
},
},
},
- 'conditions': [
- ['target_arch=="ia32"', {
- 'all_dependent_settings': {
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework Carbon',
- ],
- },
- },
- },
- }],
- ],
}],
['OS=="win" and nacl_untrusted_build==0', {
'sources': [
@@ -664,11 +651,6 @@
},
}
}],
- ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
- 'defines': [
- 'CARBON_DEPRECATED=YES',
- ],
- }],
['OS=="linux" or OS=="android"', {
'sources': [
'linux.cc',
« no previous file with comments | « webrtc/base/applefilesystem.mm ('k') | webrtc/base/iosfilesystem.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698