From 705ecc5dda2ddf3ba431aa4b8b3e34a0794bf28a Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 15 Sep 2016 00:53:26 -0700 Subject: [PATCH] GN: Change group deps to public_deps. During GN vs GYP auditing it was discovered that some GN targets that had public_configs were not exposing them to dependents where the dependent depended on a group, which in turn included that target as a dependency. Instead of changing those public_configs to all_dependent_configs (which would be a change from GYP), it's better to just change those group targets to use public_deps instead. BUG=webrtc:6323 NOTRY=True TESTED=Generated GYP and GN project files on Mac and ran the tools/gyp_flag_compare.py script before and after this patch was applied. The file in question used for inspection was the webrtc/api/webrtcsessiondescriptionfactory.cc which is a part of the libjingle_peerconnection target. Review-Url: https://codereview.webrtc.org/2344623002 Cr-Commit-Position: refs/heads/master@{#14222} --- webrtc/api/BUILD.gn | 2 +- webrtc/examples/BUILD.gn | 6 +++--- webrtc/libjingle/xmllite/BUILD.gn | 2 +- webrtc/libjingle/xmpp/BUILD.gn | 2 +- webrtc/media/BUILD.gn | 2 +- webrtc/modules/BUILD.gn | 2 +- webrtc/p2p/BUILD.gn | 2 +- webrtc/pc/BUILD.gn | 2 +- webrtc/stats/BUILD.gn | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn index cae9e65d4e..4f15bc4b05 100644 --- a/webrtc/api/BUILD.gn +++ b/webrtc/api/BUILD.gn @@ -13,7 +13,7 @@ if (is_android) { } group("api") { - deps = [ + public_deps = [ ":libjingle_peerconnection", ] } diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 8cd301e806..d05a0c79fd 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -20,13 +20,13 @@ if (is_linux) { } group("examples") { - deps = [] + public_deps = [] if (is_android) { - deps += [ ":AppRTCDemo" ] + public_deps += [ ":AppRTCDemo" ] } if (is_linux) { - deps += [ + public_deps += [ ":peerconnection_client", ":peerconnection_server", ":relayserver", diff --git a/webrtc/libjingle/xmllite/BUILD.gn b/webrtc/libjingle/xmllite/BUILD.gn index a655be1f9c..13211ac44d 100644 --- a/webrtc/libjingle/xmllite/BUILD.gn +++ b/webrtc/libjingle/xmllite/BUILD.gn @@ -9,7 +9,7 @@ import("../../build/webrtc.gni") group("xmllite") { - deps = [ + public_deps = [ ":rtc_xmllite", ] } diff --git a/webrtc/libjingle/xmpp/BUILD.gn b/webrtc/libjingle/xmpp/BUILD.gn index e5515e3122..43a39aa7eb 100644 --- a/webrtc/libjingle/xmpp/BUILD.gn +++ b/webrtc/libjingle/xmpp/BUILD.gn @@ -9,7 +9,7 @@ import("../../build/webrtc.gni") group("xmpp") { - deps = [ + public_deps = [ ":rtc_xmpp", ] } diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn index b593e99872..6179f67d6b 100644 --- a/webrtc/media/BUILD.gn +++ b/webrtc/media/BUILD.gn @@ -10,7 +10,7 @@ import("//build/config/linux/pkg_config.gni") import("../build/webrtc.gni") group("media") { - deps = [ + public_deps = [ ":rtc_media", ] } diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn index 4e60c48fa1..1ded309e34 100644 --- a/webrtc/modules/BUILD.gn +++ b/webrtc/modules/BUILD.gn @@ -15,7 +15,7 @@ declare_args() { } group("modules") { - deps = [ + public_deps = [ "audio_coding", "audio_conference_mixer", "audio_device", diff --git a/webrtc/p2p/BUILD.gn b/webrtc/p2p/BUILD.gn index bf9843a2e4..8e1f37b3ff 100644 --- a/webrtc/p2p/BUILD.gn +++ b/webrtc/p2p/BUILD.gn @@ -9,7 +9,7 @@ import("../build/webrtc.gni") group("p2p") { - deps = [ + public_deps = [ ":rtc_p2p", ] } diff --git a/webrtc/pc/BUILD.gn b/webrtc/pc/BUILD.gn index 16d5890379..94b0d94fc8 100644 --- a/webrtc/pc/BUILD.gn +++ b/webrtc/pc/BUILD.gn @@ -9,7 +9,7 @@ import("../build/webrtc.gni") group("pc") { - deps = [ + public_deps = [ ":rtc_pc", ] } diff --git a/webrtc/stats/BUILD.gn b/webrtc/stats/BUILD.gn index 16b6158628..1b5da8df67 100644 --- a/webrtc/stats/BUILD.gn +++ b/webrtc/stats/BUILD.gn @@ -9,7 +9,7 @@ import("../build/webrtc.gni") group("stats") { - deps = [ + public_deps = [ ":rtc_stats", ] }