Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Issue 2149543002: Roll chromium_revision bfec2ff09d..dfc9cd81d9 (404886:405110)

Created:
4 years, 5 months ago by buildbot
Modified:
4 years, 5 months ago
Reviewers:
CC:
webrtc-reviews_webrtc.org, qiang.lu, niklas.enbom, yujie_mao (webrtc), peah-webrtc
Base URL:
https://chromium.googlesource.com/external/webrtc@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -1 line) Patch
M DEPS View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 6 (2 generated)
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2149543002/1
4 years, 5 months ago (2016-07-13 10:05:00 UTC) #2
commit-bot: I haz the power
Try jobs failed on following builders: ios64_gn_dbg on master.tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/ios64_gn_dbg/builds/1172) mac_gn_dbg on master.tryserver.webrtc (JOB_FAILED, ...
4 years, 5 months ago (2016-07-13 10:07:30 UTC) #4
brettw
Your build is declaring the same value twice in different places with different values. It's ...
4 years, 5 months ago (2016-07-14 16:26:16 UTC) #5
phoglund
4 years, 5 months ago (2016-07-15 11:25:44 UTC) #6
On 2016/07/14 16:26:16, brettw (ping after 24h) wrote:
> Your build is declaring the same value twice in different places with
different
> values. It's actually surprising you weren't getting an error before. This
roll
> may have accidentally fixed a bug in detecting this collision.
> 
> What it looks like you want to do is to delete the "rtc_include_tests = false"
> line from webrtc/build/webrtc.gni.
> 
> And replace the rtc_include_tests line in build_overrides/webrtc.gni with:
> declare_args() {
>   rtc_include_tests = true
> }
> 
> This will make the value always true for webrtc builds, keep it false when
> compiled pulled into Chrome, and additionally allow overriding from the
command
> line for webrtc standalone builds. It looks like this is the intent.

Didn't work, webrtc build is ok but chromium build says this:

E:\b\c\b\Win_Builder\src\buildtools\win\gn.exe gen //out/Release --check
  -> returned 1
ERROR at //third_party/webrtc/BUILD.gn:381:5: Undefined identifier
if (rtc_include_tests) {
    ^----------------
See //remoting/BUILD.gn:169:5: which caused the file to be included.
    "//third_party/webrtc",
    ^---------------------
GN gen failed: 1

I think it's because Chromium pulls in webrtc/build/webrtc.gni but it
doesn't pull in build_overrides/webrtc.gni, so it misses the declaration of
the variable.

Looks like we currently declare it as false and that WebRTC overrides makes
it true standalone WebRTC. Chromium goes with the default which means it will
be false. I suppose one way to solve it could be to make it true by default
instead and have Chromium override it to false? In that case, how do I do that
here in Chromium?
https://cs.chromium.org/chromium/src/third_party/webrtc/BUILD.gn?type=cs&q=/t...

Powered by Google App Engine
This is Rietveld 408576698