| OLD | NEW | 
|    1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |    1 # Copyright (c) 2016 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/webrtc.gni") |    9 import("../build/webrtc.gni") | 
|   10 if (is_android) { |   10 if (is_android) { | 
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  133   config("apprtc_common_config") { |  133   config("apprtc_common_config") { | 
|  134     include_dirs = [ "objc/AppRTCDemo/common" ] |  134     include_dirs = [ "objc/AppRTCDemo/common" ] | 
|  135   } |  135   } | 
|  136  |  136  | 
|  137   rtc_source_set("apprtc_common") { |  137   rtc_source_set("apprtc_common") { | 
|  138     sources = [ |  138     sources = [ | 
|  139       "objc/AppRTCDemo/common/ARDUtilities.h", |  139       "objc/AppRTCDemo/common/ARDUtilities.h", | 
|  140       "objc/AppRTCDemo/common/ARDUtilities.m", |  140       "objc/AppRTCDemo/common/ARDUtilities.m", | 
|  141     ] |  141     ] | 
|  142     configs += [ |  142     configs += [ | 
|  143       "..:common_config", |  | 
|  144       ":warnings_config", |  143       ":warnings_config", | 
|  145       "//build/config/compiler:enable_arc", |  144       "//build/config/compiler:enable_arc", | 
|  146     ] |  145     ] | 
|  147     public_configs = [ |  146     public_configs = [ | 
|  148       "..:common_inherited_config", |  147       "..:common_inherited_config", | 
|  149       ":apprtc_common_config", |  148       ":apprtc_common_config", | 
|  150     ] |  149     ] | 
|  151  |  150  | 
|  152     deps = [ |  151     deps = [ | 
|  153       "../sdk:rtc_sdk_common_objc", |  152       "../sdk:rtc_sdk_common_objc", | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  202       "objc/AppRTCDemo/RTCIceCandidate+JSON.h", |  201       "objc/AppRTCDemo/RTCIceCandidate+JSON.h", | 
|  203       "objc/AppRTCDemo/RTCIceCandidate+JSON.m", |  202       "objc/AppRTCDemo/RTCIceCandidate+JSON.m", | 
|  204       "objc/AppRTCDemo/RTCIceServer+JSON.h", |  203       "objc/AppRTCDemo/RTCIceServer+JSON.h", | 
|  205       "objc/AppRTCDemo/RTCIceServer+JSON.m", |  204       "objc/AppRTCDemo/RTCIceServer+JSON.m", | 
|  206       "objc/AppRTCDemo/RTCMediaConstraints+JSON.h", |  205       "objc/AppRTCDemo/RTCMediaConstraints+JSON.h", | 
|  207       "objc/AppRTCDemo/RTCMediaConstraints+JSON.m", |  206       "objc/AppRTCDemo/RTCMediaConstraints+JSON.m", | 
|  208       "objc/AppRTCDemo/RTCSessionDescription+JSON.h", |  207       "objc/AppRTCDemo/RTCSessionDescription+JSON.h", | 
|  209       "objc/AppRTCDemo/RTCSessionDescription+JSON.m", |  208       "objc/AppRTCDemo/RTCSessionDescription+JSON.m", | 
|  210     ] |  209     ] | 
|  211     configs += [ |  210     configs += [ | 
|  212       "..:common_config", |  | 
|  213       "//build/config/compiler:enable_arc", |  211       "//build/config/compiler:enable_arc", | 
|  214       ":warnings_config", |  212       ":warnings_config", | 
|  215     ] |  213     ] | 
|  216     public_configs = [ |  214     public_configs = [ | 
|  217       "..:common_inherited_config", |  215       "..:common_inherited_config", | 
|  218       ":apprtc_signaling_config", |  216       ":apprtc_signaling_config", | 
|  219     ] |  217     ] | 
|  220     deps = [ |  218     deps = [ | 
|  221       ":apprtc_common", |  219       ":apprtc_common", | 
|  222       ":socketrocket", |  220       ":socketrocket", | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  292  |  290  | 
|  293   if (is_mac) { |  291   if (is_mac) { | 
|  294     rtc_source_set("AppRTCDemo_app") { |  292     rtc_source_set("AppRTCDemo_app") { | 
|  295       sources = [ |  293       sources = [ | 
|  296         "objc/AppRTCDemo/mac/APPRTCAppDelegate.h", |  294         "objc/AppRTCDemo/mac/APPRTCAppDelegate.h", | 
|  297         "objc/AppRTCDemo/mac/APPRTCAppDelegate.m", |  295         "objc/AppRTCDemo/mac/APPRTCAppDelegate.m", | 
|  298         "objc/AppRTCDemo/mac/APPRTCViewController.h", |  296         "objc/AppRTCDemo/mac/APPRTCViewController.h", | 
|  299         "objc/AppRTCDemo/mac/APPRTCViewController.m", |  297         "objc/AppRTCDemo/mac/APPRTCViewController.m", | 
|  300       ] |  298       ] | 
|  301       configs += [ |  299       configs += [ | 
|  302         "..:common_config", |  | 
|  303         "..:common_objc", |  300         "..:common_objc", | 
|  304         "//build/config/compiler:enable_arc", |  301         "//build/config/compiler:enable_arc", | 
|  305       ] |  302       ] | 
|  306       deps = [ |  303       deps = [ | 
|  307         ":apprtc_common", |  304         ":apprtc_common", | 
|  308         ":apprtc_signaling", |  305         ":apprtc_signaling", | 
|  309       ] |  306       ] | 
|  310     } |  307     } | 
|  311  |  308  | 
|  312     mac_app_bundle("AppRTCDemo") { |  309     mac_app_bundle("AppRTCDemo") { | 
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  353       cflags += [ "-Wno-partial-availability" ] |  350       cflags += [ "-Wno-partial-availability" ] | 
|  354     } |  351     } | 
|  355   } |  352   } | 
|  356  |  353  | 
|  357   rtc_source_set("socketrocket") { |  354   rtc_source_set("socketrocket") { | 
|  358     sources = [ |  355     sources = [ | 
|  359       "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h", |  356       "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h", | 
|  360       "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m", |  357       "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m", | 
|  361     ] |  358     ] | 
|  362     configs += [ |  359     configs += [ | 
|  363       "..:common_config", |  | 
|  364       "//build/config/compiler:enable_arc", |  360       "//build/config/compiler:enable_arc", | 
|  365       ":socketrocket_warning_config", |  361       ":socketrocket_warning_config", | 
|  366     ] |  362     ] | 
|  367     public_configs = [ |  363     public_configs = [ | 
|  368       "..:common_inherited_config", |  364       "..:common_inherited_config", | 
|  369       ":socketrocket_include_config", |  365       ":socketrocket_include_config", | 
|  370     ] |  366     ] | 
|  371  |  367  | 
|  372     libs = [ |  368     libs = [ | 
|  373       "CFNetwork.framework", |  369       "CFNetwork.framework", | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  406  |  402  | 
|  407   rtc_executable("peerconnection_client") { |  403   rtc_executable("peerconnection_client") { | 
|  408     sources = [ |  404     sources = [ | 
|  409       "peerconnection/client/conductor.cc", |  405       "peerconnection/client/conductor.cc", | 
|  410       "peerconnection/client/conductor.h", |  406       "peerconnection/client/conductor.h", | 
|  411       "peerconnection/client/defaults.cc", |  407       "peerconnection/client/defaults.cc", | 
|  412       "peerconnection/client/defaults.h", |  408       "peerconnection/client/defaults.h", | 
|  413       "peerconnection/client/peer_connection_client.cc", |  409       "peerconnection/client/peer_connection_client.cc", | 
|  414       "peerconnection/client/peer_connection_client.h", |  410       "peerconnection/client/peer_connection_client.h", | 
|  415     ] |  411     ] | 
 |  412  | 
 |  413     # TODO(ehmaldonado): Make peerconnection_client compile with the standard | 
 |  414     # set of warnings. | 
 |  415     # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6306 | 
 |  416     suppressed_configs += [ rtc_common_config ] | 
|  416     if (is_clang) { |  417     if (is_clang) { | 
|  417       # Suppress warnings from the Chromium Clang plugin. |  418       # Suppress warnings from the Chromium Clang plugin. | 
|  418       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  419       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  419       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  420       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  420     } |  421     } | 
|  421     if (is_win) { |  422     if (is_win) { | 
|  422       sources += [ |  423       sources += [ | 
|  423         "peerconnection/client/flagdefs.h", |  424         "peerconnection/client/flagdefs.h", | 
|  424         "peerconnection/client/main.cc", |  425         "peerconnection/client/main.cc", | 
|  425         "peerconnection/client/main_wnd.cc", |  426         "peerconnection/client/main_wnd.cc", | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  516       "//webrtc/system_wrappers:field_trial_default", |  517       "//webrtc/system_wrappers:field_trial_default", | 
|  517       "//webrtc/system_wrappers:metrics_default", |  518       "//webrtc/system_wrappers:metrics_default", | 
|  518     ] |  519     ] | 
|  519     if (is_clang) { |  520     if (is_clang) { | 
|  520       # Suppress warnings from the Chromium Clang plugin. |  521       # Suppress warnings from the Chromium Clang plugin. | 
|  521       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  522       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  522       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  523       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  523     } |  524     } | 
|  524   } |  525   } | 
|  525 } |  526 } | 
| OLD | NEW |