Chromium Code Reviews| OLD | NEW |
|---|---|
| 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") |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 defines += [ "WEBRTC_THREAD_RR" ] | 101 defines += [ "WEBRTC_THREAD_RR" ] |
| 102 | 102 |
| 103 deps += [ ":cpu_features_android" ] | 103 deps += [ ":cpu_features_android" ] |
| 104 | 104 |
| 105 libs += [ "log" ] | 105 libs += [ "log" ] |
| 106 } | 106 } |
| 107 | 107 |
| 108 if (is_linux) { | 108 if (is_linux) { |
| 109 defines += [ "WEBRTC_THREAD_RR" ] | 109 defines += [ "WEBRTC_THREAD_RR" ] |
| 110 | 110 |
| 111 deps += [ ":cpu_features_linux" ] | |
|
kjellander_webrtc
2016/04/04 06:09:45
Please introduce the similar if (build_with_chromi
Simon Hosie
2016/04/05 01:15:48
Done.
| |
| 112 | |
| 111 libs += [ "rt" ] | 113 libs += [ "rt" ] |
| 112 } | 114 } |
| 113 | 115 |
| 114 if (!is_mac && !is_ios) { | 116 if (!is_mac && !is_ios) { |
| 115 sources += [ "source/atomic32_posix.cc" ] | 117 sources += [ "source/atomic32_posix.cc" ] |
| 116 } | 118 } |
| 117 | 119 |
| 118 if (is_ios || is_mac) { | 120 if (is_ios || is_mac) { |
| 119 defines += [ "WEBRTC_THREAD_RR" ] | 121 defines += [ "WEBRTC_THREAD_RR" ] |
| 120 } | 122 } |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 "source/cpu_features_android.c", | 173 "source/cpu_features_android.c", |
| 172 ] | 174 ] |
| 173 | 175 |
| 174 configs += [ "..:common_config" ] | 176 configs += [ "..:common_config" ] |
| 175 public_configs = [ "..:common_inherited_config" ] | 177 public_configs = [ "..:common_inherited_config" ] |
| 176 deps = [ | 178 deps = [ |
| 177 "//third_party/android_tools:cpu_features", | 179 "//third_party/android_tools:cpu_features", |
| 178 ] | 180 ] |
| 179 } | 181 } |
| 180 } | 182 } |
| 183 | |
| 184 if (is_linux) { | |
| 185 source_set("cpu_features_linux") { | |
| 186 sources = [ | |
| 187 "source/cpu_features_linux.c", | |
| 188 ] | |
| 189 | |
| 190 configs += [ "..:common_config" ] | |
| 191 public_configs = [ "..:common_inherited_config" ] | |
| 192 } | |
| 193 } | |
| OLD | NEW |