| 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 166       "-fno-builtin-cos", | 166       "-fno-builtin-cos", | 
| 167       "-fno-builtin-sin", | 167       "-fno-builtin-sin", | 
| 168       "-fno-builtin-cosf", | 168       "-fno-builtin-cosf", | 
| 169       "-fno-builtin-sinf", | 169       "-fno-builtin-sinf", | 
| 170     ] | 170     ] | 
| 171   } | 171   } | 
| 172 } | 172 } | 
| 173 | 173 | 
| 174 source_set("webrtc") { | 174 source_set("webrtc") { | 
| 175   sources = [ | 175   sources = [ | 
|  | 176     "audio_receive_stream.h", | 
|  | 177     "audio_send_stream.h", | 
|  | 178     "audio_state.h", | 
| 176     "call.h", | 179     "call.h", | 
| 177     "config.h", | 180     "common.h", | 
| 178     "transport.h", | 181     "transport.h", | 
|  | 182     "video_receive_stream.h", | 
|  | 183     "video_send_stream.h", | 
| 179   ] | 184   ] | 
| 180 | 185 | 
| 181   defines = [] | 186   defines = [] | 
| 182   configs += [ ":common_config" ] | 187   configs += [ ":common_config" ] | 
| 183   public_configs = [ ":common_inherited_config" ] | 188   public_configs = [ ":common_inherited_config" ] | 
| 184 | 189 | 
| 185   deps = [ | 190   deps = [ | 
| 186     ":webrtc_common", | 191     ":webrtc_common", | 
| 187     "audio", | 192     "audio", | 
| 188     "base:rtc_base", | 193     "base:rtc_base", | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 229 | 234 | 
| 230 source_set("webrtc_common") { | 235 source_set("webrtc_common") { | 
| 231   sources = [ | 236   sources = [ | 
| 232     "audio_sink.h", | 237     "audio_sink.h", | 
| 233     "common_types.cc", | 238     "common_types.cc", | 
| 234     "common_types.h", | 239     "common_types.h", | 
| 235     "config.cc", | 240     "config.cc", | 
| 236     "config.h", | 241     "config.h", | 
| 237     "engine_configurations.h", | 242     "engine_configurations.h", | 
| 238     "typedefs.h", | 243     "typedefs.h", | 
|  | 244     "video_frame.h", | 
| 239   ] | 245   ] | 
| 240 | 246 | 
| 241   configs += [ ":common_config" ] | 247   configs += [ ":common_config" ] | 
| 242   public_configs = [ ":common_inherited_config" ] | 248   public_configs = [ ":common_inherited_config" ] | 
| 243 | 249 | 
| 244   if (is_clang && !is_nacl) { | 250   if (is_clang && !is_nacl) { | 
| 245     # Suppress warnings from Chrome's Clang plugins. | 251     # Suppress warnings from Chrome's Clang plugins. | 
| 246     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 252     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 247     configs -= [ "//build/config/clang:find_bad_constructs" ] | 253     configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 248   } | 254   } | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 264     "call/rtc_event_log_helper_thread.cc", | 270     "call/rtc_event_log_helper_thread.cc", | 
| 265     "call/rtc_event_log_helper_thread.h", | 271     "call/rtc_event_log_helper_thread.h", | 
| 266   ] | 272   ] | 
| 267 | 273 | 
| 268   defines = [] | 274   defines = [] | 
| 269   configs += [ ":common_config" ] | 275   configs += [ ":common_config" ] | 
| 270   public_configs = [ ":common_inherited_config" ] | 276   public_configs = [ ":common_inherited_config" ] | 
| 271 | 277 | 
| 272   deps = [ | 278   deps = [ | 
| 273     ":webrtc_common", | 279     ":webrtc_common", | 
|  | 280     "base:rtc_base_approved", | 
| 274   ] | 281   ] | 
| 275 | 282 | 
| 276   if (rtc_enable_protobuf) { | 283   if (rtc_enable_protobuf) { | 
| 277     defines += [ "ENABLE_RTC_EVENT_LOG" ] | 284     defines += [ "ENABLE_RTC_EVENT_LOG" ] | 
| 278     deps += [ ":rtc_event_log_proto" ] | 285     deps += [ ":rtc_event_log_proto" ] | 
| 279   } | 286   } | 
| 280   if (is_clang && !is_nacl) { | 287   if (is_clang && !is_nacl) { | 
| 281     # Suppress warnings from Chrome's Clang plugins. | 288     # Suppress warnings from Chrome's Clang plugins. | 
| 282     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 289     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 283     configs -= [ "//build/config/clang:find_bad_constructs" ] | 290     configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 284   } | 291   } | 
| 285 } | 292 } | 
| 286 | 293 | 
| 287 if (rtc_enable_protobuf) { | 294 if (rtc_enable_protobuf) { | 
| 288   source_set("rtc_event_log_parser") { | 295   source_set("rtc_event_log_parser") { | 
| 289     sources = [ | 296     sources = [ | 
| 290       "call/rtc_event_log_parser.cc", | 297       "call/rtc_event_log_parser.cc", | 
| 291       "call/rtc_event_log_parser.h", | 298       "call/rtc_event_log_parser.h", | 
| 292     ] | 299     ] | 
| 293 | 300 | 
| 294     configs += [ ":common_config" ] | 301     configs += [ ":common_config" ] | 
| 295     public_configs = [ ":common_inherited_config" ] | 302     public_configs = [ ":common_inherited_config" ] | 
| 296 | 303 | 
| 297     deps = [ | 304     deps = [ | 
| 298       ":rtc_event_log_proto", | 305       ":rtc_event_log_proto", | 
| 299       ":webrtc_common", | 306       ":webrtc_common", | 
|  | 307       "base:rtc_base_approved", | 
| 300     ] | 308     ] | 
| 301 | 309 | 
| 302     if (is_clang && !is_nacl) { | 310     if (is_clang && !is_nacl) { | 
| 303       # Suppress warnings from Chrome's Clang plugins. | 311       # Suppress warnings from Chrome's Clang plugins. | 
| 304       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 312       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 305       configs -= [ "//build/config/clang:find_bad_constructs" ] | 313       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 306     } | 314     } | 
| 307   } | 315   } | 
| 308 } | 316 } | 
| 309 | 317 | 
| 310 if (use_libfuzzer || use_drfuzz) { | 318 if (use_libfuzzer || use_drfuzz) { | 
| 311   # This target is only here for gn to discover fuzzer build targets under | 319   # This target is only here for gn to discover fuzzer build targets under | 
| 312   # webrtc/test/fuzzers/. | 320   # webrtc/test/fuzzers/. | 
| 313   group("webrtc_fuzzers_dummy") { | 321   group("webrtc_fuzzers_dummy") { | 
| 314     testonly = true | 322     testonly = true | 
| 315     deps = [ | 323     deps = [ | 
| 316       "test/fuzzers:webrtc_fuzzer_main", | 324       "test/fuzzers:webrtc_fuzzer_main", | 
| 317     ] | 325     ] | 
| 318   } | 326   } | 
| 319 } | 327 } | 
| OLD | NEW | 
|---|