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

Side by Side 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, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("../build/webrtc.gni") 10 import("../build/webrtc.gni")
11 11
12 static_library("system_wrappers") { 12 static_library("system_wrappers") {
13 sources = [ 13 sources = [
14 "include/aligned_array.h", 14 "include/aligned_array.h",
15 "include/aligned_malloc.h", 15 "include/aligned_malloc.h",
16 "include/atomic32.h", 16 "include/atomic32.h",
17 "include/clock.h", 17 "include/clock.h",
18 "include/cpu_features_wrapper.h", 18 "include/cpu_features_wrapper.h",
19 "include/cpu_info.h", 19 "include/cpu_info.h",
20 "include/critical_section_wrapper.h", 20 "include/critical_section_wrapper.h",
21 "include/data_log.h", 21 "include/data_log.h",
22 "include/data_log_c.h", 22 "include/data_log_c.h",
23 "include/data_log_impl.h", 23 "include/data_log_impl.h",
24 "include/event_wrapper.h", 24 "include/event_wrapper.h",
25 "include/field_trial.h", 25 "include/field_trial.h",
26 "include/file_wrapper.h", 26 "include/file_wrapper.h",
27 "include/fix_interlocked_exchange_pointer_win.h", 27 "include/fix_interlocked_exchange_pointer_win.h",
28 "include/logging.h", 28 "include/logging.h",
29 "include/metrics.h", 29 "include/metrics.h",
30 "include/ntp_time.h",
30 "include/rtp_to_ntp.h", 31 "include/rtp_to_ntp.h",
31 "include/rw_lock_wrapper.h", 32 "include/rw_lock_wrapper.h",
32 "include/sleep.h", 33 "include/sleep.h",
33 "include/sort.h", 34 "include/sort.h",
34 "include/static_instance.h", 35 "include/static_instance.h",
35 "include/stl_util.h", 36 "include/stl_util.h",
36 "include/stringize_macros.h", 37 "include/stringize_macros.h",
37 "include/timestamp_extrapolator.h", 38 "include/timestamp_extrapolator.h",
38 "include/trace.h", 39 "include/trace.h",
39 "include/utf_util_win.h", 40 "include/utf_util_win.h",
40 "source/aligned_malloc.cc", 41 "source/aligned_malloc.cc",
41 "source/atomic32_mac.cc",
42 "source/atomic32_win.cc", 42 "source/atomic32_win.cc",
43 "source/clock.cc", 43 "source/clock.cc",
44 "source/condition_variable_event_win.cc", 44 "source/condition_variable_event_win.cc",
45 "source/condition_variable_event_win.h", 45 "source/condition_variable_event_win.h",
46 "source/cpu_features.cc", 46 "source/cpu_features.cc",
47 "source/cpu_info.cc", 47 "source/cpu_info.cc",
48 "source/data_log_c.cc", 48 "source/data_log_c.cc",
49 "source/event.cc", 49 "source/event.cc",
50 "source/event_timer_posix.cc", 50 "source/event_timer_posix.cc",
51 "source/event_timer_posix.h", 51 "source/event_timer_posix.h",
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 if (is_linux) { 105 if (is_linux) {
106 defines += [ "WEBRTC_THREAD_RR" ] 106 defines += [ "WEBRTC_THREAD_RR" ]
107 107
108 if (!build_with_chromium) { 108 if (!build_with_chromium) {
109 deps += [ ":cpu_features_linux" ] 109 deps += [ ":cpu_features_linux" ]
110 } 110 }
111 111
112 libs += [ "rt" ] 112 libs += [ "rt" ]
113 } 113 }
114 114
115 if (!is_mac && !is_ios) { 115 if (is_linux || is_android) {
116 sources += [ "source/atomic32_posix.cc" ] 116 sources += [ "source/atomic32_non_darwin_unix.cc" ]
117 } 117 }
118 118
119 if (is_ios || is_mac) { 119 if (is_ios || is_mac) {
120 defines += [ "WEBRTC_THREAD_RR" ] 120 defines += [ "WEBRTC_THREAD_RR" ]
121 } 121 sources += [ "source/atomic32_darwin.cc" ]
122
123 if (is_ios) {
124 sources += [ "source/atomic32_mac.cc" ]
125 } 122 }
126 123
127 if (is_win) { 124 if (is_win) {
128 libs += [ "winmm.lib" ] 125 libs += [ "winmm.lib" ]
129 126
130 cflags = [ 127 cflags = [
131 "/wd4267", # size_t to int truncation. 128 "/wd4267", # size_t to int truncation.
132 "/wd4334", # Ignore warning on shift operator promotion. 129 "/wd4334", # Ignore warning on shift operator promotion.
133 ] 130 ]
134 } 131 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 if (is_linux) { 181 if (is_linux) {
185 source_set("cpu_features_linux") { 182 source_set("cpu_features_linux") {
186 sources = [ 183 sources = [
187 "source/cpu_features_linux.c", 184 "source/cpu_features_linux.c",
188 ] 185 ]
189 186
190 configs += [ "..:common_config" ] 187 configs += [ "..:common_config" ]
191 public_configs = [ "..:common_inherited_config" ] 188 public_configs = [ "..:common_inherited_config" ]
192 } 189 }
193 } 190 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698