Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path 'targets.0.conditions.5.1' while reading C:\b\build\slave\win64\build\src\printing\printing.gyp

Change was reverted with a poorly rebased patch in 04b30ad64d8a6309d81d9df9240250ae50d6a711

R=govind, thestig@chromium.org

BUG=630890
TEST=build/gyp_chromium --check passes
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2178003002
Cr-Commit-Position: refs/heads/master@{#407502}
(cherry picked from commit f7789f833aa26bc38fe4a74276b0a57c45ca3c65)

[skau - Gooooogle, 2016-07-25 19:06:18]

skau@google.com changed reviewers:
+ skau@google.com

[skau - Gooooogle, 2016-07-25 19:06:19]

Cherry picking change for the 2807 Windows Canary.

[Lei Zhang, 2016-07-25 19:08:15]

There's no merge approval on the bug, so I defer to govind@ here.

[govind, 2016-07-25 19:11:26]

On 2016/07/25 19:08:15, Lei Zhang wrote:
> There's no merge approval on the bug, so I defer to govind@ here.

M54 is not branched yet so no approval is needed. Please merge to branch 2807 if
change looks good to thestig@.

[chromium-reviews, 2016-07-25 19:28:13]

I'm not a committer so I can't land this without lgtm.

On Mon, Jul 25, 2016 at 12:11 PM <govind@google.com> wrote:

> On 2016/07/25 19:08:15, Lei Zhang wrote:
> > There's no merge approval on the bug, so I defer to govind@ here.
>
> M54 is not branched yet so no approval is needed. Please merge to branch
> 2807 if
> change looks good to thestig@.
>
> https://codereview.chromium.org/2178073002/
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Lei Zhang, 2016-07-25 19:30:15]

lgtm

[skau - Gooooogle, 2016-07-25 19:31:34]

The CQ bit was checked by skau@google.com

[commit-bot: I haz the power, 2016-07-25 19:32:24]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-25 19:32:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-25 19:32:26]

CLs for remote refs other than refs/pending/heads/master must contain NOTRY=true
and NOPRESUBMIT=true in order for the CQ to process them

[skau - Gooooogle, 2016-07-25 19:32:56]

Description was changed from

==========
Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\win64\build\src\printing\printing.gyp

Change was reverted with a poorly rebased patch in
04b30ad64d8a6309d81d9df9240250ae50d6a711

R=govind, thestig@chromium.org

BUG=630890

TEST=build/gyp_chromium --check passes

Review-Url: https://codereview.chromium.org/2178003002
Cr-Commit-Position: refs/heads/master@{#407502}
(cherry picked from commit f7789f833aa26bc38fe4a74276b0a57c45ca3c65)
==========

to

==========
Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\win64\build\src\printing\printing.gyp

Change was reverted with a poorly rebased patch in
04b30ad64d8a6309d81d9df9240250ae50d6a711

R=govind, thestig@chromium.org

BUG=630890

TEST=build/gyp_chromium --check passes
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2178003002
Cr-Commit-Position: refs/heads/master@{#407502}
(cherry picked from commit f7789f833aa26bc38fe4a74276b0a57c45ca3c65)
==========

[skau - Gooooogle, 2016-07-25 19:33:04]

The CQ bit was checked by skau@google.com

[commit-bot: I haz the power, 2016-07-25 19:33:35]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-25 19:37:20]

Description was changed from

==========
Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\win64\build\src\printing\printing.gyp

Change was reverted with a poorly rebased patch in
04b30ad64d8a6309d81d9df9240250ae50d6a711

R=govind, thestig@chromium.org

BUG=630890

TEST=build/gyp_chromium --check passes
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2178003002
Cr-Commit-Position: refs/heads/master@{#407502}
(cherry picked from commit f7789f833aa26bc38fe4a74276b0a57c45ca3c65)
==========

to

==========
Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

ErrorLog:
gyp: Key 'conditions' repeated at level 6 with key path
'targets.0.conditions.5.1' while reading
C:\b\build\slave\win64\build\src\printing\printing.gyp

Change was reverted with a poorly rebased patch in
04b30ad64d8a6309d81d9df9240250ae50d6a711

R=govind, thestig@chromium.org

BUG=630890

TEST=build/gyp_chromium --check passes
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2178003002
Cr-Commit-Position: refs/heads/master@{#407502}
(cherry picked from commit f7789f833aa26bc38fe4a74276b0a57c45ca3c65)
==========

[commit-bot: I haz the power, 2016-07-25 19:37:21]

Committed patchset #1 (id:1)