Skip to content

Commit

Permalink
Cleanup: Rename 'direct_dependent_configs' in third_party code.
Browse files Browse the repository at this point in the history
public_configs is the non-deprecated name of direct_dependent_configs.

BUG=None
TEST=gn gen out-gn
R=kjellander@chromium.org
TBR=behdad@chromium.org

Review URL: https://codereview.chromium.org/1031243004

Cr-Commit-Position: refs/heads/master@{#323665}
  • Loading branch information
tfarina authored and Commit bot committed Apr 3, 2015
1 parent e9ca7e1 commit 890ae91
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions third_party/libjingle/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ config("jingle_unexported_configs") {
}

# From third_party/libjingle/libjingle.gyp's target_defaults.
config("jingle_direct_dependent_configs") {
config("jingle_public_configs") {
include_dirs = [
"../../third_party/webrtc/overrides",
"overrides",
Expand Down Expand Up @@ -274,7 +274,7 @@ static_library("libjingle") {
}

configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]
all_dependent_configs = [ ":jingle_all_dependent_configs" ]
}

Expand All @@ -297,7 +297,7 @@ static_library("libjingle_p2p_constants") {
":jingle_deps",
]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]
all_dependent_configs = [ ":jingle_all_dependent_configs" ]
}

Expand All @@ -322,7 +322,7 @@ source_set("peerconnnection_server") {
":jingle_deps",
]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]
all_dependent_configs = [ ":jingle_all_dependent_configs" ]
if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
Expand All @@ -337,7 +337,7 @@ if (enable_webrtc) {
"overrides/init_webrtc.h",
]
configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]
deps = [
":libjingle_webrtc_common",
]
Expand Down Expand Up @@ -495,7 +495,7 @@ if (enable_webrtc) {
configs += [ "//build/config/compiler:no_chromium_code" ]

configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]

deps = [
"//third_party/libsrtp",
Expand Down Expand Up @@ -532,7 +532,7 @@ if (enable_webrtc) {
]

configs += [ ":jingle_unexported_configs" ]
public_configs = [ ":jingle_direct_dependent_configs" ]
public_configs = [ ":jingle_public_configs" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]

Expand Down
2 changes: 1 addition & 1 deletion third_party/libjingle/libjingle.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'webrtc_xmpp': "../webrtc/libjingle/xmpp",
},
# Most of these settings have been split according to their scope into
# :jingle_unexported_configs, :jingle_direct_dependent_configs,
# :jingle_unexported_configs, :jingle_public_configs,
# :jingle_all_dependent_configs in the GN build.
'target_defaults': {
'defines': [
Expand Down
2 changes: 1 addition & 1 deletion third_party/ots/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ source_set("ots") {
"src/woff2.h",
]

direct_dependent_configs = [ ":ots_config" ]
public_configs = [ ":ots_config" ]

deps = [
"//third_party/brotli",
Expand Down

0 comments on commit 890ae91

Please sign in to comment.