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

Unified Diff: webrtc/base/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/BUILD.gn ('k') | webrtc/base/applefilesystem.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/BUILD.gn
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index fe63d2076f05192ae31178851e90d8848e05d23b..a91b615c116a9bf7366060a783cdb6c57a957112 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -65,6 +65,9 @@
"Security.framework",
"SystemConfiguration.framework",
]
+ if (current_cpu == "x86") {
+ libs += [ "Carbon.framework" ]
+ }
}
}
@@ -288,7 +291,6 @@
defines = [ "LOGGING=1" ]
sources = [
- "applefilesystem.mm",
"arraysize.h",
"asyncfile.cc",
"asyncfile.h",
@@ -337,6 +339,7 @@
"httpcommon.h",
"httprequest.cc",
"httprequest.h",
+ "iosfilesystem.mm",
"ipaddress.cc",
"ipaddress.h",
"linked_ptr.h",
@@ -666,6 +669,10 @@
}
}
+ if (is_ios || (is_mac && current_cpu != "x86")) {
+ defines += [ "CARBON_DEPRECATED=YES" ]
+ }
+
if (is_linux || is_android) {
sources += [
"linux.cc",
« no previous file with comments | « webrtc/BUILD.gn ('k') | webrtc/base/applefilesystem.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698