cleanup gyp common_variables

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 30 matching lines @@
       # Variables needed by conditions list within the level-2 variables dict.
       'variables': {  # level 3
         # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow
         # for cross-compilation (e.g. building for either MacOS or iOS on Mac).
         # We set it automatically based on 'OS' (the host OS), but allow the
         # user to override it via GYP_DEFINES if they like.
         'skia_os%': '<(OS)',
 
         'skia_android_framework%': 0,
         'skia_arch_type%': 'x86',
+        'arm_version%': 0,
+        'arm_neon%': 0,
       },
 
       # Re-define all variables defined within the level-3 'variables' dict,
       # so that siblings of the level-2 'variables' dict can see them.
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
       'skia_arch_type%': '<(skia_arch_type)',
+      'arm_version%': '<(arm_version)',
+      'arm_neon%': '<(arm_neon)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
           # FIXME (scroggo): JSON is disabled in Android framework until we
           # solve skbug.com/2448
           'skia_build_json_writer%': 0,
         }, {
           'skia_os%': '<(skia_os)',
@@ skipping 17 matching lines @@
         }],
         [ 'skia_os == "android"', {
           'skia_static_initializers%': 0,
         }, {
           'skia_static_initializers%': 1,
         }],
         [ 'skia_os == "ios"', {
           'skia_arch_type%': 'arm',
           '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',
-          'arm_version%': 0,
-          'arm_neon%': 0,
         }],
         [ 'skia_os in ["android", "nacl"] and not skia_android_framework',
           # skia_freetype_static - on OS variants that normally would
           #     dynamically link the system FreeType library, don't do
           #     that; instead statically link to the version in
           #     third_party/freetype and third_party/externals/freetype.
           {
             'skia_freetype_static%': '1',
           }, {
             'skia_freetype_static%': '0',
@@ skipping 116 matching lines @@
     'skia_run_pdfviewer_in_gm%': 0,
     'skia_disable_inlining%': 0,
     'skia_moz2d%': 0,
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }