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

Unified Diff: webrtc/media/media.gyp

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: 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
Index: webrtc/media/media.gyp
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index 97b3b4256a5ea862f26c1c4e691b40515ffd66e2..ecd0a769c54d821fdd5e39bfd234b073b27ca46b 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -173,6 +173,24 @@
},
},
}],
+ ['OS=="mac" and target_arch=="ia32"', {
+ 'sources': [
+ 'devices/carbonvideorenderer.cc',
+ 'devices/carbonvideorenderer.h',
+ ],
+ 'link_settings': {
+ 'xcode_settings': {
+ 'OTHER_LDFLAGS': [
+ '-framework Carbon',
+ ],
+ },
+ },
+ }],
+ ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
+ 'defines': [
+ 'CARBON_DEPRECATED=YES',
+ ],
+ }],
],
}, # target rtc_media
], # targets.
« no previous file with comments | « webrtc/media/devices/videorendererfactory.h ('k') | webrtc/modules/desktop_capture/mac/desktop_configuration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698