| Index: webrtc/examples/BUILD.gn | 
| diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn | 
| index b4d2bbeea7445d1d08f147fa0f249c1061c1c746..6eb3f6f0cddbeb40c80dd4f5ff2122d40fa265ae 100644 | 
| --- a/webrtc/examples/BUILD.gn | 
| +++ b/webrtc/examples/BUILD.gn | 
| @@ -6,6 +6,7 @@ | 
| # in the file PATENTS.  All contributing project authors may | 
| # be found in the AUTHORS file in the root of the source tree. | 
|  | 
| +import("../build/webrtc.gni") | 
| if (is_android) { | 
| import("//build/config/android/config.gni") | 
| import("//build/config/android/rules.gni") | 
| @@ -14,9 +15,6 @@ if (is_android) { | 
| } else if (is_ios) { | 
| import("//build/config/ios/rules.gni") | 
| } | 
| -if (is_linux || is_win) { | 
| -  import("//webrtc/build/webrtc.gni") | 
| -} | 
| if (is_linux) { | 
| import("//build/config/linux/pkg_config.gni") | 
| } | 
| @@ -136,7 +134,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { | 
| include_dirs = [ "objc/AppRTCDemo/common" ] | 
| } | 
|  | 
| -  source_set("apprtc_common") { | 
| +  rtc_source_set("apprtc_common") { | 
| sources = [ | 
| "objc/AppRTCDemo/common/ARDUtilities.h", | 
| "objc/AppRTCDemo/common/ARDUtilities.m", | 
| @@ -173,7 +171,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { | 
| } | 
| } | 
|  | 
| -  source_set("apprtc_signaling") { | 
| +  rtc_source_set("apprtc_signaling") { | 
| sources = [ | 
| "objc/AppRTCDemo/ARDAppClient+Internal.h", | 
| "objc/AppRTCDemo/ARDAppClient.h", | 
| @@ -293,7 +291,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { | 
| } | 
|  | 
| if (is_mac) { | 
| -    source_set("AppRTCDemo_app") { | 
| +    rtc_source_set("AppRTCDemo_app") { | 
| sources = [ | 
| "objc/AppRTCDemo/mac/APPRTCAppDelegate.h", | 
| "objc/AppRTCDemo/mac/APPRTCAppDelegate.m", | 
| @@ -356,7 +354,7 @@ if (is_ios || (is_mac && target_cpu != "x86")) { | 
| } | 
| } | 
|  | 
| -  source_set("socketrocket") { | 
| +  rtc_source_set("socketrocket") { | 
| sources = [ | 
| "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.h", | 
| "objc/AppRTCDemo/third_party/SocketRocket/SRWebSocket.m", | 
| @@ -406,7 +404,7 @@ if (is_linux || is_win) { | 
| } | 
| } | 
|  | 
| -  executable("peerconnection_client") { | 
| +  rtc_executable("peerconnection_client") { | 
| sources = [ | 
| "peerconnection/client/conductor.cc", | 
| "peerconnection/client/conductor.h", | 
| @@ -418,7 +416,7 @@ if (is_linux || is_win) { | 
| if (is_clang) { | 
| # Suppress warnings from the Chromium Clang plugin. | 
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| -      configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| +      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| if (is_win) { | 
| sources += [ | 
| @@ -456,7 +454,7 @@ if (is_linux || is_win) { | 
| deps += [ "//third_party/jsoncpp" ] | 
| } | 
| } | 
| -  executable("peerconnection_server") { | 
| +  rtc_executable("peerconnection_server") { | 
| sources = [ | 
| "peerconnection/server/data_socket.cc", | 
| "peerconnection/server/data_socket.h", | 
| @@ -475,10 +473,10 @@ if (is_linux || is_win) { | 
| if (is_clang) { | 
| # Suppress warnings from the Chromium Clang plugin. | 
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| -      configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| +      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| } | 
| -  executable("relayserver") { | 
| +  rtc_executable("relayserver") { | 
| sources = [ | 
| "relayserver/relayserver_main.cc", | 
| ] | 
| @@ -492,10 +490,10 @@ if (is_linux || is_win) { | 
| if (is_clang) { | 
| # Suppress warnings from the Chromium Clang plugin. | 
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| -      configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| +      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| } | 
| -  executable("turnserver") { | 
| +  rtc_executable("turnserver") { | 
| sources = [ | 
| "turnserver/turnserver_main.cc", | 
| ] | 
| @@ -509,10 +507,10 @@ if (is_linux || is_win) { | 
| if (is_clang) { | 
| # Suppress warnings from the Chromium Clang plugin. | 
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| -      configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| +      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| } | 
| -  executable("stunserver") { | 
| +  rtc_executable("stunserver") { | 
| sources = [ | 
| "stunserver/stunserver_main.cc", | 
| ] | 
| @@ -526,7 +524,7 @@ if (is_linux || is_win) { | 
| if (is_clang) { | 
| # Suppress warnings from the Chromium Clang plugin. | 
| # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| -      configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| +      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| } | 
| } | 
|  |