ARM Skia NEON patches - 35 - First AArch64 support

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 28 matching lines @@
     'variables': {  # level 2
 
       # 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,

[djsollen, 2014/04/01 18:52:17]

so I was wrong about you needing to move it.  It looks like python doesn't
guarantee that it executes the conditions in order so you need to define
skia_arch_type here like this...

'skia_arch_type%' : 'x86',

then on line 56 put this...

'skia_arch_type%': '<(skia_arch_type)', 

[kevin.petit, 2014/04/02 13:16:48]

Done.

       },
 
       # 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)',
 
       'conditions': [
         [ 'skia_android_framework == 1', {
           'skia_os%': 'android',
           'skia_chrome_utils%': 0,
         }, {
           'skia_os%': '<(skia_os)',
           'skia_chrome_utils%': 1,
         }],
         [ 'skia_os == "win"', {
           'os_posix%': 0,
         }, {
           'os_posix%': 1,
         }],
         [ 'skia_os in ["linux", "win"]', {
           'skia_poppler_enabled%': 1,
         }, {
           'skia_poppler_enabled%': 0,
         }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', {
-          'skia_arch_width%': 64,
-        }, {
-          'skia_arch_width%': 32,
-        }],
         [ '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 ["linux", "freebsd", "openbsd", "solaris", "mac"] or skia_arch_type == "arm64"', {

[djsollen, 2014/04/01 18:52:17]

you can move this back to its original spot.

[kevin.petit, 2014/04/02 13:16:48]

Done.

+          'skia_arch_width%': 64,
+        }, {
+          'skia_arch_width%': 32,
+        }],
         [ '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 113 matching lines @@
     'skia_win_debuggers_path%': '<(skia_win_debuggers_path)',
     'skia_run_pdfviewer_in_gm%': 0,
     'skia_disable_inlining%': 0,
 
     # These are referenced by our .gypi files that list files (e.g. core.gypi)
     #
     'skia_src_path%': '../src',
     'skia_include_path%': '../include',
   },
 }