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

Unified Diff: webrtc/base/BUILD.gn

Issue 2321493002: Reland of move all reference to carbon api (Closed)
Patch Set: fix chromium build issues 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 a91b615c116a9bf7366060a783cdb6c57a957112..fe63d2076f05192ae31178851e90d8848e05d23b 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -65,9 +65,6 @@ config("rtc_base_all_dependent_config") {
"Security.framework",
"SystemConfiguration.framework",
]
- if (current_cpu == "x86") {
- libs += [ "Carbon.framework" ]
- }
}
}
@@ -291,6 +288,7 @@ rtc_static_library("rtc_base") {
defines = [ "LOGGING=1" ]
sources = [
+ "applefilesystem.mm",
"arraysize.h",
"asyncfile.cc",
"asyncfile.h",
@@ -339,7 +337,6 @@ rtc_static_library("rtc_base") {
"httpcommon.h",
"httprequest.cc",
"httprequest.h",
- "iosfilesystem.mm",
"ipaddress.cc",
"ipaddress.h",
"linked_ptr.h",
@@ -669,10 +666,6 @@ rtc_static_library("rtc_base") {
}
}
- 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