Fixes to Android.mk generation for arm64.

Fixes to Android.mk generation for arm64.

Remove warning about no optimizations for arm64 and rebaseline the
associated test.

Exclude _opts_none.cpps when building arm64, to avoid double definitions.

BUG=skia:1975
Committed: http://code.google.com/p/skia/source/detail?r=14104

[scroggo, 2014-04-08 22:05:32]

https://codereview.chromium.org/229393002/diff/1/gyp/opts.gyp
File gyp/opts.gyp (right):

https://codereview.chromium.org/229393002/diff/1/gyp/opts.gyp#newcode106
gyp/opts.gyp:106: or (skia_os == "android" and skia_arch_type not in ["x86",
"arm", "mips", "arm64"])', {
I'm surprised this didn't cause problems on the bots. Shouldn't this have
resulted in redefinitions?

[djsollen, 2014-04-09 13:18:36]

lgtm

https://codereview.chromium.org/229393002/diff/1/gyp/opts.gyp
File gyp/opts.gyp (right):

https://codereview.chromium.org/229393002/diff/1/gyp/opts.gyp#newcode106
gyp/opts.gyp:106: or (skia_os == "android" and skia_arch_type not in ["x86",
"arm", "mips", "arm64"])', {
On 2014/04/08 22:05:37, scroggo wrote:
> I'm surprised this didn't cause problems on the bots. Shouldn't this have
> resulted in redefinitions?

The bot is building with linux as the skia_os not android.

[scroggo, 2014-04-09 13:19:00]

The CQ bit was checked by scroggo@google.com

[commit-bot: I haz the power, 2014-04-09 13:19:10]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/scroggo@google.com/229393002/1

[commit-bot: I haz the power, 2014-04-09 13:34:29]

Change committed as 14104