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

Issue 931643002: gyp: chromium.gyp_env behaves like .gyp/include.gypi (Closed)

Created:
5 years, 10 months ago by dshwang
Modified:
5 years, 9 months ago
Reviewers:
Nico, scottmg
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

gyp: chromium.gyp_env behaves like .gyp/include.gypi Environment values overwrite values in chromium.gyp_env, while values in .gyp/include.gypi are merged to environment values. The difference is confusing. Moreover, .gyp/include.gypi behavior is more convenient because some developers build multiple targets (e.g. chromium, chromeos, android chrome) so they cannot use chromium.gyp_env. Committed: https://crrev.com/ce4b0d178d5ecc3b085011cd0abe146c3ba6d85b Cr-Commit-Position: refs/heads/master@{#319232}

Patch Set 1 #

Patch Set 2 : preserve overriding order #

Total comments: 4

Patch Set 3 : apply it to only GYP_DEFINES #

Total comments: 5

Patch Set 4 : ', not " #

Unified diffs Side-by-side diffs Delta from patch set Stats (+6 lines, -2 lines) Patch
M build/gyp_helper.py View 1 2 3 1 chunk +6 lines, -2 lines 0 comments Download

Messages

Total messages: 21 (4 generated)
dshwang
On 2015/02/16 16:56:13, dshwang wrote: > mailto:dongseong.hwang@intel.com changed reviewers: > + mailto:thakis@chromium.org I wanna change ...
5 years, 10 months ago (2015-02-16 16:57:13 UTC) #2
Nico
Should the values from the .gyp_env file be prepended, so that on conflicting settings, the ...
5 years, 10 months ago (2015-02-17 17:16:53 UTC) #3
dshwang
On 2015/02/17 17:16:53, Nico wrote: > Should the values from the .gyp_env file be prepended, ...
5 years, 10 months ago (2015-02-17 19:31:45 UTC) #4
dshwang
On 2015/02/17 19:31:45, dshwang wrote: > On 2015/02/17 17:16:53, Nico wrote: > > Should the ...
5 years, 10 months ago (2015-02-17 19:37:28 UTC) #5
dshwang
Current behavior is that .gyp_env is ignored if there is any evn vars although massage ...
5 years, 10 months ago (2015-02-19 19:21:23 UTC) #6
dshwang
Hi Nico, could you review again?
5 years, 9 months ago (2015-02-25 14:15:34 UTC) #7
Nico
+scottmg for a second opinion
5 years, 9 months ago (2015-02-25 19:36:04 UTC) #9
scottmg
Meh. These files are a bug anyway. https://codereview.chromium.org/931643002/diff/20001/build/gyp_helper.py File build/gyp_helper.py (right): https://codereview.chromium.org/931643002/diff/20001/build/gyp_helper.py#newcode45 build/gyp_helper.py:45: os.environ[var] = ...
5 years, 9 months ago (2015-02-25 19:58:20 UTC) #10
dshwang
thx for reviewing. I addressed the concerns https://codereview.chromium.org/931643002/diff/20001/build/gyp_helper.py File build/gyp_helper.py (right): https://codereview.chromium.org/931643002/diff/20001/build/gyp_helper.py#newcode45 build/gyp_helper.py:45: os.environ[var] = ...
5 years, 9 months ago (2015-02-26 09:30:30 UTC) #11
dshwang
would you have a chance to look at it again?
5 years, 9 months ago (2015-03-04 14:26:55 UTC) #12
scottmg
lgtm with those I guess unless Nico would prefer not. https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py File build/gyp_helper.py (right): https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py#newcode45 ...
5 years, 9 months ago (2015-03-04 18:10:38 UTC) #13
dshwang
https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py File build/gyp_helper.py (right): https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py#newcode45 build/gyp_helper.py:45: behavior = "replaces"; On 2015/03/04 18:10:37, scottmg wrote: > ...
5 years, 9 months ago (2015-03-04 18:28:07 UTC) #14
scottmg
https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py File build/gyp_helper.py (right): https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py#newcode48 build/gyp_helper.py:48: behavior = "overrides" On 2015/03/04 18:28:07, dshwang wrote: > ...
5 years, 9 months ago (2015-03-04 18:33:44 UTC) #15
dshwang
On 2015/03/04 18:33:44, scottmg wrote: > https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py > File build/gyp_helper.py (right): > > https://codereview.chromium.org/931643002/diff/40001/build/gyp_helper.py#newcode48 > ...
5 years, 9 months ago (2015-03-05 06:44:28 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/931643002/60001
5 years, 9 months ago (2015-03-05 06:45:35 UTC) #19
commit-bot: I haz the power
Committed patchset #4 (id:60001)
5 years, 9 months ago (2015-03-05 07:08:22 UTC) #20
commit-bot: I haz the power
5 years, 9 months ago (2015-03-05 07:09:00 UTC) #21
Message was sent while issue was closed.
Patchset 4 (id:??) landed as
https://crrev.com/ce4b0d178d5ecc3b085011cd0abe146c3ba6d85b
Cr-Commit-Position: refs/heads/master@{#319232}

Powered by Google App Engine
This is Rietveld 408576698