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

Unified Diff: webrtc/system_wrappers/BUILD.gn

Issue 1999723002: Fix iOS GN build and cleanup system_wrappers (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Renamed to atomic32_non_darwin_unix.cc due to _android suffix filtering Created 4 years, 7 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/system_wrappers/BUILD.gn
diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn
index da785e2fcaf805a24373e18fb6a2dd9a0b981292..435418fcd197c3a8f8aa43cf38059b27616435b6 100644
--- a/webrtc/system_wrappers/BUILD.gn
+++ b/webrtc/system_wrappers/BUILD.gn
@@ -27,6 +27,7 @@ static_library("system_wrappers") {
"include/fix_interlocked_exchange_pointer_win.h",
"include/logging.h",
"include/metrics.h",
+ "include/ntp_time.h",
"include/rtp_to_ntp.h",
"include/rw_lock_wrapper.h",
"include/sleep.h",
@@ -38,7 +39,6 @@ static_library("system_wrappers") {
"include/trace.h",
"include/utf_util_win.h",
"source/aligned_malloc.cc",
- "source/atomic32_mac.cc",
"source/atomic32_win.cc",
"source/clock.cc",
"source/condition_variable_event_win.cc",
@@ -112,16 +112,13 @@ static_library("system_wrappers") {
libs += [ "rt" ]
}
- if (!is_mac && !is_ios) {
- sources += [ "source/atomic32_posix.cc" ]
+ if (is_linux || is_android) {
+ sources += [ "source/atomic32_non_darwin_unix.cc" ]
}
if (is_ios || is_mac) {
defines += [ "WEBRTC_THREAD_RR" ]
- }
-
- if (is_ios) {
- sources += [ "source/atomic32_mac.cc" ]
+ sources += [ "source/atomic32_darwin.cc" ]
}
if (is_win) {

Powered by Google App Engine
This is Rietveld 408576698