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

Issue 2080563002: Workaround java.gypi inclusion error in Chromium builds. (Closed)

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

Description

Workaround java.gypi inclusion error in Chromium builds. In order to switch Chromium to use WebRTC targets instead of duplicated code listings in src/third_party/libjingle it must be possible for Chromium to process webrtc/api/api.gyp. This is currently not possible since it includes build/java.gypi, of which the path is different in a Chromium checkout. It's not possible to resolve this in another way since 'includes' processing takes place early in the GYP cycle, before it's possible to use variables. They're also processed ignoring conditional statements, resulting in an error when api.gyp is processed. BUG=webrtc:4256 TBR=perkj@webrtc.org NOTRY=True Committed: https://crrev.com/442e6ee76a845a7fe3a16a7189bdc8da031f1208 Cr-Commit-Position: refs/heads/master@{#13208}

Patch Set 1 #

Patch Set 2 : Changes to all.gyp #

Unified diffs Side-by-side diffs Delta from patch set Stats (+61 lines, -33 lines) Patch
M all.gyp View 1 1 chunk +5 lines, -0 lines 0 comments Download
M webrtc/api/api.gyp View 1 chunk +0 lines, -29 lines 0 comments Download
A webrtc/api/api_java.gyp View 1 1 chunk +52 lines, -0 lines 0 comments Download
M webrtc/api/api_tests.gyp View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/build/android_tests.gyp View 1 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/webrtc_examples.gyp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 10 (4 generated)
kjellander_webrtc
4 years, 6 months ago (2016-06-20 05:58:52 UTC) #1
kjellander_webrtc
I'm running Chromium tryjobs in PS#1 since the all.gyp change in PS#2 doesn't apply to ...
4 years, 6 months ago (2016-06-20 05:59:46 UTC) #2
kjellander_webrtc
TBRing this to unblock me, since this is getting more and more urgent (and needs ...
4 years, 6 months ago (2016-06-20 08:29:41 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2080563002/20001
4 years, 6 months ago (2016-06-20 08:29:50 UTC) #6
commit-bot: I haz the power
Committed patchset #2 (id:20001)
4 years, 6 months ago (2016-06-20 08:34:12 UTC) #8
commit-bot: I haz the power
4 years, 6 months ago (2016-06-20 08:34:18 UTC) #10
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/442e6ee76a845a7fe3a16a7189bdc8da031f1208
Cr-Commit-Position: refs/heads/master@{#13208}

Powered by Google App Engine
This is Rietveld 408576698