Speculative Android build fix.

Speculative Android build fix.

TBR=robertphillips

Committed: https://code.google.com/p/skia/source/detail?r=12041

[Stephen White, 2013-10-30 22:38:19]

Committed patchset #1 manually as r12041 (presubmit successful).

[robertphillips, 2013-10-30 22:48:00]

lgtm

[Tom Hudson, 2013-11-01 11:25:26]

Not LGTM?! This gyp change has rolled into Chrome for Android, but
SkMorphology_opts_none.cpp hasn't!

[robertphillips, 2013-11-01 12:03:24]

This is the Skia-side opts change. I believe the problematic one is in the DEPS
roll to r12041 (https://codereview.chromium.org/53753002/).

Leon|Tom - is there something else I needed to do to get this to work in Chrome
for Android? I tested it on some extra Android bots (android_x86_dbg &
android_aosp) to try to prevent errors. Is the Android team updating to ToT
Chrome but not ToT Skia? Is this a problem with building with the system copy of
Skia?

[Stephen White, 2013-11-01 12:25:01]

Are there failing bots somewhere?This change went into Skia, and I made sure
that the Chrome DEPS roll had the appropriate gyp file changes:
https://codereview.chromium.org/52453004/

[Tom Hudson, 2013-11-01 12:30:09]

It looks like somehow my repository was in an inconsistent state. Not sure what
caused that, but I'm building now. Sorry for raising the red flag.

[Stephen White, 2013-11-01 12:51:07]

On 2013/11/01 12:30:09, Tom Hudson wrote:
> It looks like somehow my repository was in an inconsistent state. Not sure
what
> caused that, but I'm building now. Sorry for raising the red flag.

No problem! Glad it all worked out.