| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 82           'skia_os%': '<(skia_os)', | 82           'skia_os%': '<(skia_os)', | 
| 83           'skia_chrome_utils%': 1, | 83           'skia_chrome_utils%': 1, | 
| 84           'skia_use_android_framework_defines%': 0, | 84           'skia_use_android_framework_defines%': 0, | 
| 85           'skia_use_system_json%': 0, | 85           'skia_use_system_json%': 0, | 
| 86         }], | 86         }], | 
| 87         [ 'skia_os == "win"', { | 87         [ 'skia_os == "win"', { | 
| 88           'os_posix%': 0, | 88           'os_posix%': 0, | 
| 89         }, { | 89         }, { | 
| 90           'os_posix%': 1, | 90           'os_posix%': 1, | 
| 91         }], | 91         }], | 
|  | 92         [ 'skia_os == "linux"', { | 
|  | 93           # ANGLE on linux require these two variable be defined. | 
|  | 94           'chromeos%': 0, | 
|  | 95           'use_x11%': 1, | 
|  | 96         }], | 
| 92         [ 'skia_os == "android"', { | 97         [ 'skia_os == "android"', { | 
| 93           'skia_static_initializers%': 0, | 98           'skia_static_initializers%': 0, | 
| 94           'skia_egl%': 1, | 99           'skia_egl%': 1, | 
| 95         }, { | 100         }, { | 
| 96           'skia_static_initializers%': 1, | 101           'skia_static_initializers%': 1, | 
| 97         }], | 102         }], | 
| 98         [ 'skia_os == "ios"', { | 103         [ 'skia_os == "ios"', { | 
| 99           'skia_arch_type%': 'arm', | 104           'skia_arch_type%': 'arm', | 
| 100           'arm_version%': 7, | 105           'arm_version%': 7, | 
| 101           'arm_neon%': 0, # neon asm files known not to work with the ios build | 106           'arm_neon%': 0, # neon asm files known not to work with the ios build | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 157 | 162 | 
| 158       # This variable allows the user to customize the optimization level used | 163       # This variable allows the user to customize the optimization level used | 
| 159       # by the compiler.  The user should be aware that this has different | 164       # by the compiler.  The user should be aware that this has different | 
| 160       # meanings for different compilers and should exercise caution when | 165       # meanings for different compilers and should exercise caution when | 
| 161       # overriding it. | 166       # overriding it. | 
| 162       [ 'skia_os == "win"', { | 167       [ 'skia_os == "win"', { | 
| 163         'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve
     l)', | 168         'skia_release_optimization_level%': '<(skia_default_vs_optimization_leve
     l)', | 
| 164       }, { | 169       }, { | 
| 165         'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev
     el)', | 170         'skia_release_optimization_level%': '<(skia_default_gcc_optimization_lev
     el)', | 
| 166       }], | 171       }], | 
|  | 172       [ 'skia_os == "linux"', { | 
|  | 173         # ANGLE on linux require these two variable be defined. | 
|  | 174         'chromeos%': 0, | 
|  | 175         'use_x11%': 1, | 
|  | 176       }], | 
| 167       [ 'skia_sanitizer', { | 177       [ 'skia_sanitizer', { | 
| 168         'skia_clang_build': 1, | 178         'skia_clang_build': 1, | 
| 169         'skia_keep_frame_pointer': 1, | 179         'skia_keep_frame_pointer': 1, | 
| 170       }, { | 180       }, { | 
| 171         'skia_clang_build%': 0, | 181         'skia_clang_build%': 0, | 
| 172         'skia_keep_frame_pointer%': 0, | 182         'skia_keep_frame_pointer%': 0, | 
| 173       }], | 183       }], | 
| 174       [ 'skia_shared_lib or skia_sanitizer or skia_os == "android"', { | 184       [ 'skia_shared_lib or skia_sanitizer or skia_os == "android" or (skia_os =
     = "linux" and skia_angle == 1)', { | 
| 175           'skia_pic%' : 1, | 185           'skia_pic%' : 1, | 
| 176         }, { | 186         }, { | 
| 177           'skia_pic%' : 0, | 187           'skia_pic%' : 0, | 
| 178         } | 188         } | 
| 179       ], | 189       ], | 
| 180     ], | 190     ], | 
| 181 | 191 | 
| 182     # Re-define all variables defined within the level-2 'variables' dict, | 192     # Re-define all variables defined within the level-2 'variables' dict, | 
| 183     # so that siblings of the level-1 'variables' dict can see them. | 193     # so that siblings of the level-1 'variables' dict can see them. | 
| 184     'arm_version%': '<(arm_version)', | 194     'arm_version%': '<(arm_version)', | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 235         '-ffast-math',           # Optimize float math even when it breaks IEEE 
     compliance. | 245         '-ffast-math',           # Optimize float math even when it breaks IEEE 
     compliance. | 
| 236         #'-flto'                  # Enable link-time optimization. | 246         #'-flto'                  # Enable link-time optimization. | 
| 237     ], | 247     ], | 
| 238 | 248 | 
| 239     # These are referenced by our .gypi files that list files (e.g. core.gypi) | 249     # These are referenced by our .gypi files that list files (e.g. core.gypi) | 
| 240     # | 250     # | 
| 241     'skia_src_path%': '../src', | 251     'skia_src_path%': '../src', | 
| 242     'skia_include_path%': '../include', | 252     'skia_include_path%': '../include', | 
| 243   }, | 253   }, | 
| 244 } | 254 } | 
| OLD | NEW | 
|---|