| 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 { | 9 { | 
| 10   'includes': [ '../build/common.gypi', ], | 10   'includes': [ '../build/common.gypi', ], | 
| 11   'targets': [ | 11   'targets': [ | 
| 12     { | 12     { | 
| 13       'target_name': 'rtc_p2p', | 13       'target_name': 'rtc_p2p', | 
| 14       'type': 'static_library', | 14       'type': 'static_library', | 
| 15       'dependencies': [ | 15       'dependencies': [ | 
| 16         '<(webrtc_root)/base/base.gyp:rtc_base', | 16         '<(webrtc_root)/base/base.gyp:rtc_base', | 
| 17         '<(webrtc_root)/common.gyp:webrtc_common', | 17         '<(webrtc_root)/common.gyp:webrtc_common', | 
| 18       ], | 18       ], | 
| 19       'cflags_cc!': [ |  | 
| 20         '-Wnon-virtual-dtor', |  | 
| 21       ], |  | 
| 22       'sources': [ | 19       'sources': [ | 
| 23         'base/asyncstuntcpsocket.cc', | 20         'base/asyncstuntcpsocket.cc', | 
| 24         'base/asyncstuntcpsocket.h', | 21         'base/asyncstuntcpsocket.h', | 
| 25         'base/basicpacketsocketfactory.cc', | 22         'base/basicpacketsocketfactory.cc', | 
| 26         'base/basicpacketsocketfactory.h', | 23         'base/basicpacketsocketfactory.h', | 
| 27         'base/candidate.h', | 24         'base/candidate.h', | 
| 28         'base/common.h', | 25         'base/common.h', | 
| 29         'base/dtlstransportchannel.cc', | 26         'base/dtlstransportchannel.cc', | 
| 30         'base/dtlstransportchannel.h', | 27         'base/dtlstransportchannel.h', | 
| 31         'base/p2pconstants.cc', | 28         'base/p2pconstants.cc', | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 77         'base/turnserver.h', | 74         'base/turnserver.h', | 
| 78         'base/udpport.h', | 75         'base/udpport.h', | 
| 79         'client/basicportallocator.cc', | 76         'client/basicportallocator.cc', | 
| 80         'client/basicportallocator.h', | 77         'client/basicportallocator.h', | 
| 81         'client/httpportallocator.cc', | 78         'client/httpportallocator.cc', | 
| 82         'client/httpportallocator.h', | 79         'client/httpportallocator.h', | 
| 83         'client/socketmonitor.cc', | 80         'client/socketmonitor.cc', | 
| 84         'client/socketmonitor.h', | 81         'client/socketmonitor.h', | 
| 85       ], | 82       ], | 
| 86       'direct_dependent_settings': { | 83       'direct_dependent_settings': { | 
| 87         'cflags_cc!': [ |  | 
| 88           '-Wnon-virtual-dtor', |  | 
| 89         ], |  | 
| 90         'defines': [ | 84         'defines': [ | 
| 91           'FEATURE_ENABLE_VOICEMAIL', | 85           'FEATURE_ENABLE_VOICEMAIL', | 
| 92         ], | 86         ], | 
| 93       }, | 87       }, | 
| 94       'conditions': [ | 88       'conditions': [ | 
| 95         ['build_with_chromium==0', { | 89         ['build_with_chromium==0', { | 
| 96           'defines': [ | 90           'defines': [ | 
| 97             'FEATURE_ENABLE_VOICEMAIL', | 91             'FEATURE_ENABLE_VOICEMAIL', | 
| 98             'FEATURE_ENABLE_PSTN', | 92             'FEATURE_ENABLE_PSTN', | 
| 99           ], | 93           ], | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 118         }], | 112         }], | 
| 119       ], | 113       ], | 
| 120     }, | 114     }, | 
| 121     { | 115     { | 
| 122       'target_name': 'libstunprober', | 116       'target_name': 'libstunprober', | 
| 123       'type': 'static_library', | 117       'type': 'static_library', | 
| 124       'dependencies': [ | 118       'dependencies': [ | 
| 125         '<(webrtc_root)/base/base.gyp:rtc_base', | 119         '<(webrtc_root)/base/base.gyp:rtc_base', | 
| 126         '<(webrtc_root)/common.gyp:webrtc_common', | 120         '<(webrtc_root)/common.gyp:webrtc_common', | 
| 127       ], | 121       ], | 
| 128       'cflags_cc!': [ |  | 
| 129         '-Wnon-virtual-dtor', |  | 
| 130       ], |  | 
| 131       'sources': [ | 122       'sources': [ | 
| 132         'stunprober/stunprober.cc', | 123         'stunprober/stunprober.cc', | 
| 133       ], | 124       ], | 
| 134     }, | 125     }, | 
| 135     { | 126     { | 
| 136       'target_name': 'stun_prober', | 127       'target_name': 'stun_prober', | 
| 137       'type': 'executable', | 128       'type': 'executable', | 
| 138       'dependencies': [ | 129       'dependencies': [ | 
| 139         'libstunprober', | 130         'libstunprober', | 
| 140         'rtc_p2p' | 131         'rtc_p2p' | 
| 141       ], | 132       ], | 
| 142       'cflags_cc!': [ |  | 
| 143         '-Wnon-virtual-dtor', |  | 
| 144       ], |  | 
| 145       'sources': [ | 133       'sources': [ | 
| 146         'stunprober/main.cc', | 134         'stunprober/main.cc', | 
| 147       ], | 135       ], | 
| 148     }, | 136     }, | 
| 149   ],  # targets | 137   ],  # targets | 
| 150   'conditions': [ | 138   'conditions': [ | 
| 151     ['include_tests==1', { | 139     ['include_tests==1', { | 
| 152       'targets' : [ | 140       'targets' : [ | 
| 153         { | 141         { | 
| 154           'target_name': 'rtc_p2p_unittest', | 142           'target_name': 'rtc_p2p_unittest', | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 187                 ], | 175                 ], | 
| 188               }], | 176               }], | 
| 189             ], | 177             ], | 
| 190           }, | 178           }, | 
| 191         },  # target rtc_p2p_unittest | 179         },  # target rtc_p2p_unittest | 
| 192       ],  # targets | 180       ],  # targets | 
| 193     }],  # include_tests==1 | 181     }],  # include_tests==1 | 
| 194   ],  # conditions | 182   ],  # conditions | 
| 195 } | 183 } | 
| 196 | 184 | 
| OLD | NEW | 
|---|