Skip to content

Commit

Permalink
Reland "Adding absl includes and defines to rtc_* templates."
Browse files Browse the repository at this point in the history
This reverts commit 8436a69.

Reason for revert: 
New absl roll -> https://chromium-review.googlesource.com/1071468

Original change's description:
> Revert "Reland "Adding absl includes and defines to rtc_* templates.""
> 
> This reverts commit bdb0fe4.
> 
> Reason for revert: https://ci.chromium.org/buildbot/chromium.fyi/Jumbo%20Win%20x64/11502
> 
> Original change's description:
> > Reland "Adding absl includes and defines to rtc_* templates."
> > 
> > This reverts commit 85cb19f.
> > 
> > Reason for revert: The new version of Abseil should fix the previous
> > issue.
> > 
> > Original change's description:
> > > Revert "Reland "Adding absl includes and defines to rtc_* templates.""
> > > 
> > > This reverts commit 9632112.
> > > 
> > > Reason for revert: It breaks the WebRTC roll into Chromium.
> > > https://chromium-review.googlesource.com/c/chromium/src/+/1061476
> > > 
> > > Original change's description:
> > > > Reland "Adding absl includes and defines to rtc_* templates."
> > > > 
> > > > This reverts commit d161eda.
> > > > 
> > > > Reason for revert: The problem with iOS trybots should be fixed.
> > > > 
> > > > Original change's description:
> > > > > Revert "Adding absl includes and defines to rtc_* templates."
> > > > >
> > > > > This reverts commit 9d8f385.
> > > > >
> > > > > Reason for revert: Breaks some trybots: https://build.chromium.org/p/client.webrtc/builders/iOS64%20Release/builds/12793.
> > > > >
> > > > > Original change's description:
> > > > > > Adding absl includes and defines to rtc_* templates.
> > > > > >
> > > > > > This CL implicitly adds the -I compiler flag and absl macros to WebRTC
> > > > > > templates. In order to include absl headers using relative paths, WebRTC
> > > > > > needs to ensure that all its build targets are able to see absl headers.
> > > > > >
> > > > > > This can also be done with public_deps, but WebRTC is trying to avoid
> > > > > > it because it creates problems with other build systems. Given this
> > > > > > constraint, using rtc_* templates is the most reliable solution.
> > > > > >
> > > > > > Please note that rtc_* templates are adding absl includes and defines
> > > > > > as public_configs, this means that build targets with WebRTC targets
> > > > > > in their public_deps will propagate these configs following the GN
> > > > > > guideline.
> > > > > >
> > > > > > Bug: webrtc:8821
> > > > > > Change-Id: I4aa594a524f4bd045bcb3e80d76cc27f06fe01d7
> > > > > > Reviewed-on: https://webrtc-review.googlesource.com/70367
> > > > > > Reviewed-by: Patrik Höglund <[email protected]>
> > > > > > Commit-Queue: Mirko Bonadei <[email protected]>
> > > > > > Cr-Commit-Position: refs/heads/master@{#22927}
> > > > >
> > > > > [email protected],[email protected]
> > > > >
> > > > > Change-Id: Id8e1f881c57553386566eb1970f6b9f8632cab37
> > > > > No-Presubmit: true
> > > > > No-Tree-Checks: true
> > > > > No-Try: true
> > > > > Bug: webrtc:8821
> > > > > Reviewed-on: https://webrtc-review.googlesource.com/71000
> > > > > Reviewed-by: Mirko Bonadei <[email protected]>
> > > > > Commit-Queue: Mirko Bonadei <[email protected]>
> > > > > Cr-Commit-Position: refs/heads/master@{#22928}
> > > > 
> > > > [email protected],[email protected]
> > > > 
> > > > Bug: webrtc:8821
> > > > Change-Id: I6ee2eda97bbcd4c9be25c9c4073272192b0373f8
> > > > Reviewed-on: https://webrtc-review.googlesource.com/71700
> > > > Reviewed-by: Patrik Höglund <[email protected]>
> > > > Reviewed-by: Mirko Bonadei <[email protected]>
> > > > Commit-Queue: Mirko Bonadei <[email protected]>
> > > > Cr-Commit-Position: refs/heads/master@{#23251}
> > > 
> > > [email protected],[email protected]
> > > 
> > > Change-Id: I61fb749797314ca514691b341c66f7f39ef45491
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: webrtc:8821
> > > Reviewed-on: https://webrtc-review.googlesource.com/77220
> > > Reviewed-by: Mirko Bonadei <[email protected]>
> > > Commit-Queue: Mirko Bonadei <[email protected]>
> > > Cr-Commit-Position: refs/heads/master@{#23264}
> > 
> > [email protected],[email protected]
> > 
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> > 
> > Bug: webrtc:8821
> > Change-Id: I71dea953a002a0d526949c627653bcad0c6518fc
> > Reviewed-on: https://webrtc-review.googlesource.com/77781
> > Reviewed-by: Mirko Bonadei <[email protected]>
> > Commit-Queue: Mirko Bonadei <[email protected]>
> > Cr-Commit-Position: refs/heads/master@{#23317}
> 
> [email protected],[email protected]
> 
> Change-Id: I6010f9264dba7bcc4e82c4f4bbfb2eca561e500e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8821, chromium:845158
> Reviewed-on: https://webrtc-review.googlesource.com/78061
> Reviewed-by: Mirko Bonadei <[email protected]>
> Commit-Queue: Mirko Bonadei <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#23328}

[email protected],[email protected]

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:8821, chromium:845158
Change-Id: Iebe0958012c39e1321487e5425f43904eaf5fe91
Reviewed-on: https://webrtc-review.googlesource.com/78705
Reviewed-by: Mirko Bonadei <[email protected]>
Commit-Queue: Mirko Bonadei <[email protected]>
Cr-Commit-Position: refs/heads/master@{#23403}
  • Loading branch information
MirkoBonadei authored and Commit Bot committed May 28, 2018
1 parent b3085b2 commit fae51e4
Showing 1 changed file with 28 additions and 5 deletions.
33 changes: 28 additions & 5 deletions webrtc.gni
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ all_poison_types = [
"software_video_codecs",
]

absl_include_config = "//third_party/abseil-cpp:absl_include_config"
absl_define_config = "//third_party/abseil-cpp:absl_define_config"

template("rtc_test") {
test(target_name) {
forward_variables_from(invoker,
Expand All @@ -331,7 +334,11 @@ template("rtc_test") {
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
public_configs = [
rtc_common_inherited_config,
absl_include_config,
absl_define_config,
]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
Expand Down Expand Up @@ -398,7 +405,11 @@ template("rtc_source_set") {
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
public_configs = [
rtc_common_inherited_config,
absl_include_config,
absl_define_config,
]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
Expand Down Expand Up @@ -428,7 +439,11 @@ template("rtc_executable") {
]
deps += invoker.deps

public_configs = [ rtc_common_inherited_config ]
public_configs = [
rtc_common_inherited_config,
absl_include_config,
absl_define_config,
]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
Expand Down Expand Up @@ -491,7 +506,11 @@ template("rtc_static_library") {
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
public_configs = [
rtc_common_inherited_config,
absl_include_config,
absl_define_config,
]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
Expand Down Expand Up @@ -554,7 +573,11 @@ template("rtc_shared_library") {
configs += invoker.configs
configs -= rtc_remove_configs
configs -= invoker.suppressed_configs
public_configs = [ rtc_common_inherited_config ]
public_configs = [
rtc_common_inherited_config,
absl_include_config,
absl_define_config,
]
if (defined(invoker.public_configs)) {
public_configs += invoker.public_configs
}
Expand Down

0 comments on commit fae51e4

Please sign in to comment.