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

Unified Diff: webrtc/media/BUILD.gn

Issue 2317343003: Revert of move 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
« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/media/devices/carbonvideorenderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/BUILD.gn
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 5545aef066602a62486482179f094c0375406d72..029d143163858194238dca8404ee055506a1811f 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -186,6 +186,17 @@
"strmiids.lib",
]
}
+ if (is_mac && current_cpu == "x86") {
+ sources += [
+ "devices/carbonvideorenderer.cc",
+ "devices/carbonvideorenderer.h",
+ ]
+ libs += [ "Carbon.framework" ]
+ }
+ if (is_ios || (is_mac && current_cpu != "x86")) {
+ defines += [ "CARBON_DEPRECATED=YES" ]
+ }
+
deps += [
"..:webrtc_common",
"../api:call_api",
« no previous file with comments | « webrtc/engine_configurations.h ('k') | webrtc/media/devices/carbonvideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698