| OLD | NEW |
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 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 # Target for building freetype. | 5 # Target for building freetype. |
| 6 { | 6 { |
| 7 'targets': [ | 7 'targets': [ |
| 8 { | 8 { |
| 9 'target_name': 'freetype', | 9 'target_name': 'freetype', |
| 10 'type': 'none', | 10 'type': 'none', |
| 11 'conditions': [ | 11 'conditions': [ |
| 12 [ 'skia_freetype_static', | 12 [ 'skia_freetype_static', |
| 13 { | 13 { |
| 14 'dependencies': [ | 14 'dependencies': [ |
| 15 'freetype_static' | 15 'freetype_static' |
| 16 ], | 16 ], |
| 17 'export_dependent_settings': [ | 17 'export_dependent_settings': [ |
| 18 'freetype_static' | 18 'freetype_static' |
| 19 ], | 19 ], |
| 20 'conditions': [ | 20 'conditions': [ |
| 21 [ 'skia_os in ["android", "nacl"]', | 21 [ 'skia_os == "android"', |
| 22 { | 22 { |
| 23 'direct_dependent_settings': { | 23 'direct_dependent_settings': { |
| 24 'defines': [ | 24 'defines': [ |
| 25 # Both Android and NaCl provide at least FreeType 2.4.0 | 25 # Android provides at least FreeType 2.4.0 |
| 26 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', | 26 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400', |
| 27 'SK_CAN_USE_DLOPEN=0', | 27 'SK_CAN_USE_DLOPEN=0', |
| 28 ], | 28 ], |
| 29 } | 29 } |
| 30 } | 30 } |
| 31 ] | 31 ] |
| 32 ], | 32 ], |
| 33 }, { # (not skia_freetype_static) | 33 }, { # (not skia_freetype_static) |
| 34 # dynamic linking depends on the OS: | 34 # dynamic linking depends on the OS: |
| 35 'conditions': [ | 35 'conditions': [ |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 '-DPIC', | 107 '-DPIC', |
| 108 '-DDARWIN_NO_CARBON', | 108 '-DDARWIN_NO_CARBON', |
| 109 '-DFT2_BUILD_LIBRARY', | 109 '-DFT2_BUILD_LIBRARY', |
| 110 '-O2', | 110 '-O2', |
| 111 ], | 111 ], |
| 112 }], | 112 }], |
| 113 ], | 113 ], |
| 114 }, | 114 }, |
| 115 ], | 115 ], |
| 116 } | 116 } |
| OLD | NEW |