Fixes to Android.mk generation for arm64.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 783ea4eb7afd8cc98c2f97c70c173c6b4f5aed6b..745259f75099ee2d28ed3ceb81cbd1ed05bc79e6 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -103,7 +103,7 @@
         }],
         [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
-            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips"])', {
+            or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {

[scroggo, 2014/04/08 22:05:37]

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]

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

           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',