Swtich guard from aura to ash.

Switch guard to ash from aura.

Ash resources should only be refenced when ash is on.

BUG=None
TEST=local with a funny config, test reference.

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

[oshima, 2013-07-13 03:40:53]

so win8 bot is using use_ash=1?
Just want to confirm.

[Peter Mayo, 2013-07-15 19:01:02]

On 2013/07/13 03:40:53, oshima wrote:
> so win8 bot is using use_ash=1?
> Just want to confirm.

"win8 aura" is a test runner for "win aura" which does not use use_ash=1.

Are you suggessting that use_aura & win implies use_ash, but that is not encoded
in gyp?

[oshima, 2013-07-15 20:09:12]

win7_aura/ win8_aura does build and run ash_unittests, so I assume use_ash is
set somewhere,
although I'm not familiar with windows side, so I may be wrong. Adding @cpu who
should know better.

[Peter Mayo, 2013-07-15 21:18:54]

On 2013/07/15 20:09:12, oshima wrote:
> win7_aura/ win8_aura does build and run ash_unittests, so I assume use_ash is
> set somewhere,
> although I'm not familiar with windows side, so I may be wrong. Adding @cpu
who
> should know better.

I think I came up with a more demonstrably isolated change.


The other change makes sense to do in the long run I think, since it is less
surprising to not include ash_resources when use_ash is 0.

[rjkroege, 2013-07-15 21:53:32]

https://codereview.chromium.org/18470007/diff/5002/chrome/chrome_resources.gyp
File chrome/chrome_resources.gyp (right):

https://codereview.chromium.org/18470007/diff/5002/chrome/chrome_resources.gy...
chrome/chrome_resources.gyp:357: ['use_aura==1 and use_ash==0', {
this probably needs a comment.

[Peter Mayo, 2013-07-15 22:11:02]

https://codereview.chromium.org/18470007/diff/5002/chrome/chrome_resources.gyp
File chrome/chrome_resources.gyp (right):

https://codereview.chromium.org/18470007/diff/5002/chrome/chrome_resources.gy...
chrome/chrome_resources.gyp:357: ['use_aura==1 and use_ash==0', {
On 2013/07/15 21:53:32, rjkroege wrote:
> this probably needs a comment.
> 
> 

Done.

[oshima, 2013-07-15 22:49:55]

@scottmg told me that win aura bots has use_ash=1, which is
currently set in

https://code.google.com/p/chromium/codesearch#chromium/src/build/common.gypi&...

so I agree that your original CL is correct and better.

[Peter Mayo, 2013-07-15 22:58:36]

https://codereview.chromium.org/18470007/diff/1/chrome/chrome_repack_chrome_1...
File chrome/chrome_repack_chrome_100_percent.gypi (right):

https://codereview.chromium.org/18470007/diff/1/chrome/chrome_repack_chrome_1...
chrome/chrome_repack_chrome_100_percent.gypi:24: ],
dependencies don't work on actions, they work on targets, which this is not.

Drop addition.

[oshima, 2013-07-15 23:00:00]

lgtm

[commit-bot: I haz the power, 2013-07-15 23:08:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/petermayo@chromium.org/18470007/17001

[cpu_(ooo_6.6-7.5), 2013-07-15 23:30:49]

was there a question for me?

as far as I know use_aura =1 implies use_ash but in windows we really don't use
#ifdef USE_ASH because we don't have win8 specific builds, so we do the ash
detection at runtime.

lgtm I guess.

[Peter Mayo, 2013-07-16 00:43:34]

On 2013/07/15 23:30:49, cpu wrote:
> was there a question for me?
> 
> as far as I know use_aura =1 implies use_ash but in windows we really don't
use
> #ifdef USE_ASH because we don't have win8 specific builds, so we do the ash
> detection at runtime.
> 
> lgtm I guess.

Cool, so long as that's true, it makes sense to force the inclusion of the ash
resources into all of the win builds by using the ash flag in the gyp files,
otherwise runtime support can't completely work.

Thanks,
Peter.

[commit-bot: I haz the power, 2013-07-16 03:40:20]

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

[commit-bot: I haz the power, 2013-07-17 03:02:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/petermayo@chromium.org/18470007/17001

[commit-bot: I haz the power, 2013-07-17 04:59:00]

Change committed as 211943