| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 '../../build/win_precompile.gypi', | 7 '../../build/win_precompile.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'enabled_libjingle_device_manager%': 0, | 10 'enabled_libjingle_device_manager%': 0, |
| 11 'libjingle_additional_deps%': [], | 11 'libjingle_additional_deps%': [], |
| 12 'libjingle_peerconnection_additional_deps%': [], | 12 'libjingle_peerconnection_additional_deps%': [], |
| 13 'libjingle_source%': "source", | 13 'libjingle_source%': "source", |
| 14 'libpeer_target_type%': 'static_library', | 14 'libpeer_target_type%': 'static_library', |
| 15 'libpeer_allocator_shim%': 0, | 15 'libpeer_allocator_shim%': 0, |
| 16 }, | 16 }, |
| 17 # Most of these settings have been split according to their scope into |
| 18 # :jingle_unexported_configs, :jingle_direct_dependent_configs, |
| 19 # :jingle_all_dependent_configs in the GN build. |
| 17 'target_defaults': { | 20 'target_defaults': { |
| 18 'defines': [ | 21 'defines': [ |
| 19 'EXPAT_RELATIVE_PATH', | 22 'EXPAT_RELATIVE_PATH', |
| 20 'FEATURE_ENABLE_SSL', | 23 'FEATURE_ENABLE_SSL', |
| 21 'GTEST_RELATIVE_PATH', | 24 'GTEST_RELATIVE_PATH', |
| 22 'HAVE_SRTP', | 25 'HAVE_SRTP', |
| 23 'HAVE_WEBRTC_VIDEO', | 26 'HAVE_WEBRTC_VIDEO', |
| 24 'HAVE_WEBRTC_VOICE', | 27 'HAVE_WEBRTC_VOICE', |
| 25 'LOGGING_INSIDE_WEBRTC', | 28 'LOGGING_INSIDE_WEBRTC', |
| 26 'NO_MAIN_THREAD_WRAPPING', | 29 'NO_MAIN_THREAD_WRAPPING', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 41 'include_dirs': [ | 44 'include_dirs': [ |
| 42 './overrides', | 45 './overrides', |
| 43 '../../third_party/webrtc/overrides', | 46 '../../third_party/webrtc/overrides', |
| 44 './<(libjingle_source)', | 47 './<(libjingle_source)', |
| 45 '../..', | 48 '../..', |
| 46 '../../testing/gtest/include', | 49 '../../testing/gtest/include', |
| 47 '../../third_party', | 50 '../../third_party', |
| 48 '../../third_party/libyuv/include', | 51 '../../third_party/libyuv/include', |
| 49 '../../third_party/usrsctp', | 52 '../../third_party/usrsctp', |
| 50 ], | 53 ], |
| 54 # These dependencies have been translated into :jingle_deps in the GN build. |
| 51 'dependencies': [ | 55 'dependencies': [ |
| 52 '<(DEPTH)/base/base.gyp:base', | 56 '<(DEPTH)/base/base.gyp:base', |
| 53 '<(DEPTH)/net/net.gyp:net', | 57 '<(DEPTH)/net/net.gyp:net', |
| 54 '<(DEPTH)/third_party/expat/expat.gyp:expat', | 58 '<(DEPTH)/third_party/expat/expat.gyp:expat', |
| 55 ], | 59 ], |
| 56 'export_dependent_settings': [ | 60 'export_dependent_settings': [ |
| 57 '<(DEPTH)/third_party/expat/expat.gyp:expat', | 61 '<(DEPTH)/third_party/expat/expat.gyp:expat', |
| 58 ], | 62 ], |
| 59 'direct_dependent_settings': { | 63 'direct_dependent_settings': { |
| 60 'include_dirs': [ | 64 'include_dirs': [ |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 'defines': [ | 151 'defines': [ |
| 148 'CHROMEOS', | 152 'CHROMEOS', |
| 149 ], | 153 ], |
| 150 }], | 154 }], |
| 151 ], | 155 ], |
| 152 }, | 156 }, |
| 153 'all_dependent_settings': { | 157 'all_dependent_settings': { |
| 154 'configurations': { | 158 'configurations': { |
| 155 'Debug': { | 159 'Debug': { |
| 156 'defines': [ | 160 'defines': [ |
| 157 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of | 161 # TODO(sergeyu): Fix libjingle to use NDEBUG instead of _DEBUG and |
| 158 # _DEBUG and remove this define. See above as well. | 162 # remove this define. See above and GN file as well. |
| 159 '_DEBUG', | 163 '_DEBUG', |
| 160 ], | 164 ], |
| 161 } | 165 } |
| 162 }, | 166 }, |
| 163 }, | 167 }, |
| 164 'variables': { | 168 'variables': { |
| 165 'clang_warning_flags_unset': [ | 169 'clang_warning_flags_unset': [ |
| 166 # Don't warn about string->bool used in asserts. | 170 # Don't warn about string->bool used in asserts. |
| 167 '-Wstring-conversion', | 171 '-Wstring-conversion', |
| 168 ], | 172 ], |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 ], | 257 ], |
| 254 }], | 258 }], |
| 255 ['OS=="freebsd"', { | 259 ['OS=="freebsd"', { |
| 256 'defines': [ | 260 'defines': [ |
| 257 'FREEBSD', | 261 'FREEBSD', |
| 258 ], | 262 ], |
| 259 }], | 263 }], |
| 260 ], | 264 ], |
| 261 }, | 265 }, |
| 262 'targets': [ | 266 'targets': [ |
| 267 # GN version: //third_party/libjingle |
| 263 { | 268 { |
| 264 'target_name': 'libjingle', | 269 'target_name': 'libjingle', |
| 265 'type': 'static_library', | 270 'type': 'static_library', |
| 266 'includes': [ 'libjingle_common.gypi' ], | 271 'includes': [ 'libjingle_common.gypi' ], |
| 267 'sources!' : [ | 272 'sources!' : [ |
| 268 # Compiled as part of libjingle_p2p_constants. | 273 # Compiled as part of libjingle_p2p_constants. |
| 269 '<(libjingle_source)/talk/p2p/base/constants.cc', | 274 '<(libjingle_source)/talk/p2p/base/constants.cc', |
| 270 '<(libjingle_source)/talk/p2p/base/constants.h', | 275 '<(libjingle_source)/talk/p2p/base/constants.h', |
| 271 ], | 276 ], |
| 272 'dependencies': [ | 277 'dependencies': [ |
| 273 '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base', | 278 '<(DEPTH)/third_party/webrtc/base/base.gyp:webrtc_base', |
| 274 'libjingle_p2p_constants', | 279 'libjingle_p2p_constants', |
| 275 '<@(libjingle_additional_deps)', | 280 '<@(libjingle_additional_deps)', |
| 276 ], | 281 ], |
| 277 }, # target libjingle | 282 }, # target libjingle |
| 278 # This has to be is a separate project due to a bug in MSVS 2008 and the | 283 # This has to be is a separate project due to a bug in MSVS 2008 and the |
| 279 # current toolset on android. The problem is that we have two files named | 284 # current toolset on android. The problem is that we have two files named |
| 280 # "constants.cc" and MSVS/android doesn't handle this properly. | 285 # "constants.cc" and MSVS/android doesn't handle this properly. |
| 281 # GYP currently has guards to catch this, so if you want to remove it, | 286 # GYP currently has guards to catch this, so if you want to remove it, |
| 282 # run GYP and if GYP has removed the validation check, then we can assume | 287 # run GYP and if GYP has removed the validation check, then we can assume |
| 283 # that the toolchains have been fixed (we currently use VS2010 and later, | 288 # that the toolchains have been fixed (we currently use VS2010 and later, |
| 284 # so VS2008 isn't a concern anymore). | 289 # so VS2008 isn't a concern anymore). |
| 290 # |
| 291 # GN version: //third_party/libjingle:libjingle_p2p_constants |
| 285 { | 292 { |
| 286 'target_name': 'libjingle_p2p_constants', | 293 'target_name': 'libjingle_p2p_constants', |
| 287 'type': 'static_library', | 294 'type': 'static_library', |
| 288 'sources': [ | 295 'sources': [ |
| 289 '<(libjingle_source)/talk/p2p/base/constants.cc', | 296 '<(libjingle_source)/talk/p2p/base/constants.cc', |
| 290 '<(libjingle_source)/talk/p2p/base/constants.h', | 297 '<(libjingle_source)/talk/p2p/base/constants.h', |
| 291 ], | 298 ], |
| 292 }, # target libjingle_p2p_constants | 299 }, # target libjingle_p2p_constants |
| 300 # GN version: //third_party/libjingle:peerconnection_server |
| 293 { | 301 { |
| 294 'target_name': 'peerconnection_server', | 302 'target_name': 'peerconnection_server', |
| 295 'type': 'executable', | 303 'type': 'executable', |
| 296 'sources': [ | 304 'sources': [ |
| 297 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc'
, | 305 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.cc'
, |
| 298 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h', | 306 '<(libjingle_source)/talk/examples/peerconnection/server/data_socket.h', |
| 299 '<(libjingle_source)/talk/examples/peerconnection/server/main.cc', | 307 '<(libjingle_source)/talk/examples/peerconnection/server/main.cc', |
| 300 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc
', | 308 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.cc
', |
| 301 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h'
, | 309 '<(libjingle_source)/talk/examples/peerconnection/server/peer_channel.h'
, |
| 302 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc', | 310 '<(libjingle_source)/talk/examples/peerconnection/server/utils.cc', |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 647 # in this directory and not lib.target as will otherwise be | 655 # in this directory and not lib.target as will otherwise be |
| 648 # the case with make builds. | 656 # the case with make builds. |
| 649 'product_dir': '<(PRODUCT_DIR)/lib', | 657 'product_dir': '<(PRODUCT_DIR)/lib', |
| 650 }], | 658 }], |
| 651 ], | 659 ], |
| 652 }, # target libpeerconnection | 660 }, # target libpeerconnection |
| 653 ], | 661 ], |
| 654 }], | 662 }], |
| 655 ], | 663 ], |
| 656 } | 664 } |
| OLD | NEW |