| OLD | NEW | 
|---|
| 1 # Copyright 2011 The Android Open Source Project | 1 # Copyright 2011 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 # This file is automatically included by gyp_skia when building any target. | 6 # This file is automatically included by gyp_skia when building any target. | 
| 7 | 7 | 
| 8 { | 8 { | 
| 9   'includes': [ | 9   'includes': [ | 
| 10     'common_variables.gypi', | 10     'common_variables.gypi', | 
| 11   ], | 11   ], | 
| 12 | 12 | 
| 13   'target_defaults': { | 13   'target_defaults': { | 
| 14     'defines': [ | 14     'defines': [ | 
| 15       'SK_INTERNAL', | 15       'SK_INTERNAL', | 
| 16       'SK_GAMMA_SRGB', | 16       'SK_GAMMA_SRGB', | 
| 17       'SK_GAMMA_APPLY_TO_A8', | 17       'SK_GAMMA_APPLY_TO_A8', | 
| 18       'SK_SCALAR_TO_FLOAT_EXCLUDED',  # temporary to allow Chrome to call SkFloa
     tToScalar | 18       'SK_SCALAR_TO_FLOAT_EXCLUDED',  # temporary to allow Chrome to call SkFloa
     tToScalar | 
|  | 19       'SK_USE_DISCARDABLE_SCALEDIMAGECACHE', | 
| 19     ], | 20     ], | 
| 20 | 21 | 
| 21     # Validate the 'skia_os' setting against 'OS', because only certain | 22     # Validate the 'skia_os' setting against 'OS', because only certain | 
| 22     # combinations work.  You should only override 'skia_os' for certain | 23     # combinations work.  You should only override 'skia_os' for certain | 
| 23     # situations, like building for iOS on a Mac. | 24     # situations, like building for iOS on a Mac. | 
| 24     'variables': { | 25     'variables': { | 
| 25       'conditions': [ | 26       'conditions': [ | 
| 26         [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \ | 27         [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \ | 
| 27                                   (skia_os == "nacl" and OS == "linux") or \ | 28                                   (skia_os == "nacl" and OS == "linux") or \ | 
| 28                                   (skia_os == "chromeos" and OS == "linux"))', { | 29                                   (skia_os == "chromeos" and OS == "linux"))', { | 
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 96           'Release': { 'defines': [ 'NDEBUG' ] }, | 97           'Release': { 'defines': [ 'NDEBUG' ] }, | 
| 97           'Release_Developer': { | 98           'Release_Developer': { | 
| 98             'inherit_from': ['Release'], | 99             'inherit_from': ['Release'], | 
| 99             'defines': [ 'SK_DEVELOPER=1' ], | 100             'defines': [ 'SK_DEVELOPER=1' ], | 
| 100           }, | 101           }, | 
| 101         }, | 102         }, | 
| 102       }], | 103       }], | 
| 103     ], | 104     ], | 
| 104   }, # end 'target_defaults' | 105   }, # end 'target_defaults' | 
| 105 } | 106 } | 
| OLD | NEW | 
|---|