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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. |
| 10 | 10 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 160 "-fno-builtin-cos", | 160 "-fno-builtin-cos", |
| 161 "-fno-builtin-sin", | 161 "-fno-builtin-sin", |
| 162 "-fno-builtin-cosf", | 162 "-fno-builtin-cosf", |
| 163 "-fno-builtin-sinf", | 163 "-fno-builtin-sinf", |
| 164 ] | 164 ] |
| 165 } | 165 } |
| 166 } | 166 } |
| 167 | 167 |
| 168 source_set("webrtc") { | 168 source_set("webrtc") { |
| 169 sources = [ | 169 sources = [ |
| 170 "audio_send_stream.h", | |
|
kjellander_webrtc
2016/02/25 11:12:06
These were missing from any .gyp* file.
| |
| 171 "audio_state.h", | |
| 170 "call.h", | 172 "call.h", |
| 171 "config.h", | 173 "video_frame.h", |
|
kjellander_webrtc
2016/02/25 11:12:05
moved to common.gyp:webrtc_common since they only
| |
| 172 "frame_callback.h", | |
| 173 "transport.h", | |
| 174 ] | 174 ] |
| 175 | 175 |
| 176 defines = [] | 176 defines = [] |
| 177 configs += [ ":common_config" ] | 177 configs += [ ":common_config" ] |
| 178 public_configs = [ ":common_inherited_config" ] | 178 public_configs = [ ":common_inherited_config" ] |
| 179 | 179 |
| 180 deps = [ | 180 deps = [ |
| 181 ":webrtc_common", | 181 ":webrtc_common", |
| 182 "audio", | 182 "audio", |
| 183 "base:rtc_base", | 183 "base:rtc_base", |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 ":webrtc", | 221 ":webrtc", |
| 222 "modules/video_capture:video_capture_internal_impl", | 222 "modules/video_capture:video_capture_internal_impl", |
| 223 "modules/video_render:video_render_internal_impl", | 223 "modules/video_render:video_render_internal_impl", |
| 224 "test", | 224 "test", |
| 225 ] | 225 ] |
| 226 } | 226 } |
| 227 } | 227 } |
| 228 | 228 |
| 229 source_set("webrtc_common") { | 229 source_set("webrtc_common") { |
| 230 sources = [ | 230 sources = [ |
| 231 "audio_receive_stream.h", | |
|
kjellander_webrtc
2016/02/25 11:12:06
Maybe it's confusing to have audio_recieve_stream.
| |
| 232 "audio_sink.h", | |
| 231 "common_types.cc", | 233 "common_types.cc", |
| 232 "common_types.h", | 234 "common_types.h", |
| 233 "config.cc", | 235 "config.cc", |
| 234 "config.h", | 236 "config.h", |
| 235 "engine_configurations.h", | 237 "engine_configurations.h", |
| 238 "frame_callback.h", | |
| 239 "transport.h", | |
| 236 "typedefs.h", | 240 "typedefs.h", |
| 241 "video_receive_stream.h", | |
| 242 "video_renderer.h", | |
| 243 "video_send_stream.h", | |
| 237 ] | 244 ] |
| 238 | 245 |
| 239 configs += [ ":common_config" ] | 246 configs += [ ":common_config" ] |
| 240 public_configs = [ ":common_inherited_config" ] | 247 public_configs = [ ":common_inherited_config" ] |
| 241 | 248 |
| 242 if (is_clang && !is_nacl) { | 249 if (is_clang && !is_nacl) { |
| 243 # Suppress warnings from Chrome's Clang plugins. | 250 # Suppress warnings from Chrome's Clang plugins. |
| 244 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 251 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 245 configs -= [ "//build/config/clang:find_bad_constructs" ] | 252 configs -= [ "//build/config/clang:find_bad_constructs" ] |
| 246 } | 253 } |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 283 if (use_libfuzzer || use_drfuzz) { | 290 if (use_libfuzzer || use_drfuzz) { |
| 284 # This target is only here for gn to discover fuzzer build targets under | 291 # This target is only here for gn to discover fuzzer build targets under |
| 285 # webrtc/test/fuzzers/. | 292 # webrtc/test/fuzzers/. |
| 286 group("webrtc_fuzzers_dummy") { | 293 group("webrtc_fuzzers_dummy") { |
| 287 testonly = true | 294 testonly = true |
| 288 deps = [ | 295 deps = [ |
| 289 "test/fuzzers:webrtc_fuzzer_main", | 296 "test/fuzzers:webrtc_fuzzer_main", |
| 290 ] | 297 ] |
| 291 } | 298 } |
| 292 } | 299 } |
| OLD | NEW |