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

Unified Diff: webrtc/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 | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index a4b07594b8f2f4175b49e2846940bda8f99ec0b0..f42cc24646e72e114050df37ec2fa23d632f44ec 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -562,6 +562,10 @@
"base/sslstreamadapter_unittest.cc",
]
}
+ if (is_ios || (is_mac && target_cpu != "x86")) {
+ defines = [ "CARBON_DEPRECATED=YES" ]
+ }
+
if (rtc_use_quic) {
sources += [
"p2p/quic/quicconnectionhelper_unittest.cc",
@@ -824,6 +828,9 @@
if (is_mac) {
sources += [ "base/macsocketserver_unittest.cc" ]
}
+ if (is_ios || (is_mac && target_cpu != "x86")) {
+ defines = [ "CARBON_DEPRECATED=YES" ]
+ }
if (is_clang) {
# Suppress warnings from the Chromium Clang plugin.
# See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
« no previous file with comments | « no previous file | webrtc/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698