| OLD | NEW | 
|---|
| 1 # Copyright 2012 The Android Open Source Project | 1 # Copyright 2012 The Android Open Source Project | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be | 
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. | 
| 5 | 5 | 
| 6 { | 6 { | 
| 7   # Get ready for the ugly... | 7   # Get ready for the ugly... | 
| 8   # | 8   # | 
| 9   # - We have to nest our variables dictionaries multiple levels deep, so that | 9   # - We have to nest our variables dictionaries multiple levels deep, so that | 
| 10   #   this and other gyp files can rely on previously-set variable values in | 10   #   this and other gyp files can rely on previously-set variable values in | 
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 46         'variables': { # level 4 | 46         'variables': { # level 4 | 
| 47           # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow | 47           # We use 'skia_os' instead of 'OS' throughout our gyp files, to allow | 
| 48           # for cross-compilation (e.g. building for either MacOS or iOS on Mac)
     . | 48           # for cross-compilation (e.g. building for either MacOS or iOS on Mac)
     . | 
| 49           # We set it automatically based on 'OS' (the host OS), but allow the | 49           # We set it automatically based on 'OS' (the host OS), but allow the | 
| 50           # user to override it via GYP_DEFINES if they like. | 50           # user to override it via GYP_DEFINES if they like. | 
| 51           'skia_os%': '<(OS)', | 51           'skia_os%': '<(OS)', | 
| 52         }, | 52         }, | 
| 53         'skia_os%': '<(skia_os)', | 53         'skia_os%': '<(skia_os)', | 
| 54         'vulkan_merged_into_skia': '1', | 54         'vulkan_merged_into_skia': '1', | 
| 55         'skia_android_framework%': 0, | 55         'skia_android_framework%': 0, | 
| 56         # RAW codec needs exceptions. Due to that, it is a separate target. Its 
     usage can be |  | 
| 57         # controlled by skia_codec_decodes_raw. |  | 
| 58         'skia_codec_decodes_raw%': 1, |  | 
| 59         'conditions' : [ | 56         'conditions' : [ | 
| 60           [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { | 57           [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "mac"]', { | 
| 61             'skia_arch_type%': 'x86_64', | 58             'skia_arch_type%': 'x86_64', | 
| 62           }, { | 59           }, { | 
| 63             'skia_arch_type%': 'x86', | 60             'skia_arch_type%': 'x86', | 
| 64           }], | 61           }], | 
|  | 62           # RAW codec needs exceptions. Due to that, it is a separate target. It
     s usage can be | 
|  | 63           # controlled by skia_codec_decodes_raw. | 
|  | 64           ['skia_os == "win"', { | 
|  | 65             'skia_codec_decodes_raw%' : 0, | 
|  | 66           }, { | 
|  | 67             'skia_codec_decodes_raw%' : 1, | 
|  | 68           }], | 
| 65         ], | 69         ], | 
| 66         'arm_version%': 0, | 70         'arm_version%': 0, | 
| 67         'arm_neon%': 0, | 71         'arm_neon%': 0, | 
| 68         'skia_egl%': 0, | 72         'skia_egl%': 0, | 
| 69       }, | 73       }, | 
| 70 | 74 | 
| 71       # Re-define all variables defined within the level-3 'variables' dict, | 75       # Re-define all variables defined within the level-3 'variables' dict, | 
| 72       # so that siblings of the level-2 'variables' dict can see them. | 76       # so that siblings of the level-2 'variables' dict can see them. | 
| 73       # (skia_os will depend on skia_android_framework.) | 77       # (skia_os will depend on skia_android_framework.) | 
| 74       'skia_android_framework%': '<(skia_android_framework)', | 78       'skia_android_framework%': '<(skia_android_framework)', | 
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 255         #'-ffast-math',           # Optimize float math even when it breaks IEEE
      compliance. | 259         #'-ffast-math',           # Optimize float math even when it breaks IEEE
      compliance. | 
| 256         #'-flto'                  # Enable link-time optimization. | 260         #'-flto'                  # Enable link-time optimization. | 
| 257     ], | 261     ], | 
| 258 | 262 | 
| 259     # These are referenced by our .gypi files that list files (e.g. core.gypi) | 263     # These are referenced by our .gypi files that list files (e.g. core.gypi) | 
| 260     # | 264     # | 
| 261     'skia_src_path%': '../src', | 265     'skia_src_path%': '../src', | 
| 262     'skia_include_path%': '../include', | 266     'skia_include_path%': '../include', | 
| 263   }, | 267   }, | 
| 264 } | 268 } | 
| OLD | NEW | 
|---|