Force use_ash to 0 if use_aura is 0.

Force use_ash to 0 if use_aura is 0.

Also remove old Windows gyp workaround to enable Ash if use_aura on Windows (as it is now on by default).

BUG=Using use_aura=0 on Windows doesn't compile as it tries to build Ash.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=227160

[gab, 2013-10-02 21:23:21]

Sir, WDYT of this?

Otherwise I have to specify both use_aura=0 and use_ash=0 to try non-Aura on
Windows (I need to do this to repro a Mac failure for the "Enable control list
on bots" CL which I think is simply due to non-Aura; i.e., not Mac specific per
se...).

Cheers,
Gab

[cpu_(ooo_6.6-7.5), 2013-10-03 06:17:29]

well, I think linux or blink bots are the issue. Adding dpranke to the review.

[Dirk Pranke, 2013-10-03 17:53:46]

On 2013/10/03 06:17:29, cpu wrote:
> well, I think linux or blink bots are the issue. Adding dpranke to the review.

I think this is probably fine. I have no strong opinions on it one way or
another. lgtm.

[gab, 2013-10-03 18:41:22]

Thanks,

Carlos LGTY?

Gab

[cpu_(ooo_6.6-7.5), 2013-10-03 19:11:36]

I thought I tried that and backfired. But I tried many things.

lgtm

[scottmg, 2013-10-03 19:15:42]

https://codereview.chromium.org/25665008/diff/1/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/25665008/diff/1/build/common.gypi#newcode74
build/common.gypi:74: 'use_ash%': 1,
i don't think subsequent conditions at the same level "do what you want"? but i
could be wrong.. if it works, lgtm.

[gab, 2013-10-03 19:48:34]

Reply below, I'll give it a shot now.

https://codereview.chromium.org/25665008/diff/1/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/25665008/diff/1/build/common.gypi#newcode74
build/common.gypi:74: 'use_ash%': 1,
On 2013/10/03 19:15:42, scottmg wrote:
> i don't think subsequent conditions at the same level "do what you want"? but
i
> could be wrong.. if it works, lgtm.

Ya, I'm also surprised that this works (I just proved it to myself by popping a
message box inside a non-aura ifdef from browser main)...

It seems values explicitly specified in chromium.gyp_env are not overridden by
whatever gyp says.
I just "proved" this to myself by trying to specify "use_aura=0 use_ash=1" in my
chromium.gyp_env and noticing that the new rule I added below didn't have any
effect (i.e. use_ash remained 1).

[commit-bot: I haz the power, 2013-10-03 19:50:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/25665008/1

[commit-bot: I haz the power, 2013-10-03 20:24:23]

Retried try job too often on linux_chromeos_clang for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-10-03 20:29:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/25665008/1

[commit-bot: I haz the power, 2013-10-03 20:49:57]

Retried try job too often on linux_chromeos for step(s) app_list_unittests,
ash_unittests, aura_unittests, base_unittests, browser_tests,
cacheinvalidation_unittests, check_deps, chromeos_unittests,
components_unittests, content_browsertests, content_unittests, crypto_unittests,
dbus_unittests, device_unittests, gpu_unittests, interactive_ui_tests,
ipc_tests, jingle_unittests, media_unittests, net_unittests, ppapi_unittests,
printing_unittests, sandbox_linux_unittests, sql_unittests, sync_unit_tests,
unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-10-04 15:01:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/25665008/1

[commit-bot: I haz the power, 2013-10-04 15:21:50]

Retried try job too often on linux_chromeos_clang for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[gab, 2013-10-04 17:54:15]

More details on gyp logic (which I think I've figured out correctly...) below!

https://codereview.chromium.org/25665008/diff/56001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/25665008/diff/56001/build/common.gypi#newcode130
build/common.gypi:130: # Ash needs Aura.
So it actually looks like the first block above defines "default values" which
(unless overwritten by chromium.gyp_env) are copied to this block which is then
responsible for changing variables based on conditions based on other variables.

(and there seems to be more nested blocks of variables below... this is crazy...
but I think this works...!)

Having this code above would not work as use_aura is always 0 if not specified
(until it is defined by the default in the previous block which is only readable
here... gyp isn't sequential line-by-line, but rather block by block... it
appears...!

[commit-bot: I haz the power, 2013-10-04 17:55:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/25665008/56001

[scottmg, 2013-10-04 18:20:31]

https://codereview.chromium.org/25665008/diff/56001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/25665008/diff/56001/build/common.gypi#newcode130
build/common.gypi:130: # Ash needs Aura.
On 2013/10/04 17:54:15, gab wrote:
> here... gyp isn't sequential line-by-line, but rather block by block... it
> appears...!

Yeah, that's what I was trying to say before. Crazy indeed. lgtm2.

[commit-bot: I haz the power, 2013-10-04 21:24:24]

Retried try job too often on win_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-10-04 22:19:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/25665008/56001

[commit-bot: I haz the power, 2013-10-05 01:01:40]

Change committed as 227160