update gyp for ARM builds to be more well defined.

gyp/common_variables.gypi

 # Copyright 2012 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # Get ready for the ugly...
   #
   # - We have to nest our variables dictionaries multiple levels deep, so that
   #   this and other gyp files can rely on previously-set variable values in
@@ skipping 51 matching lines @@
         }, {
           'skia_arch_width%': 32,
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
         }, {
           'skia_static_initializers%': 1,
         }],
         [ 'skia_os == "ios"', {
           'skia_arch_type%': 'arm',
-          'armv7%': 1,
+          'arm_version%': 7,
           'arm_neon%': 0, # neon asm files known not to work with the ios build
         },{ # skia_os is not ios
           'skia_arch_type%': 'x86',
-          'armv7%': 0,
+          'arm_version%': 0,
           'arm_neon%': 0,
         }],
       ],
 
       'skia_scalar%': 'float',
       'skia_mesa%': 0,
       'skia_nv_path_rendering%': 0,
       'skia_stroke_path_rendering%': 0,
       'skia_android_path_rendering%': 0,
       'skia_texture_cache_mb_limit%': 0,
@@ skipping 27 matching lines @@
       # overriding it.
       [ 'skia_os == "win"', {
         'skia_release_optimization_level%': '<(skia_default_vs_optimization_level)',
       }, {
         'skia_release_optimization_level%': '<(skia_default_gcc_optimization_level)',
       }],
     ],
 
     # Re-define all variables defined within the level-2 'variables' dict,
     # so that siblings of the level-1 'variables' dict can see them.
-    'armv7%': '<(armv7)',
+    'arm_version%': '<(arm_version)',
     'arm_neon%': '<(arm_neon)',
+    'arm_neon_optional%': 0,
     'skia_os%': '<(skia_os)',
     'os_posix%': '<(os_posix)',
     'skia_scalar%': '<(skia_scalar)',
     'skia_mesa%': '<(skia_mesa)',
     'skia_nv_path_rendering%': '<(skia_nv_path_rendering)',
     'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
     'skia_android_path_rendering%': '<(skia_android_path_rendering)',
     'skia_texture_cache_mb_limit%': '<(skia_texture_cache_mb_limit)',
     'skia_angle%': '<(skia_angle)',
     'skia_arch_width%': '<(skia_arch_width)',
@@ skipping 14 matching lines @@
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: