| OLD | NEW |
| 1 # Copyright 2014 Google Inc. | 1 # Copyright 2014 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 | 5 |
| 6 { | 6 { |
| 7 'variables': { | 7 'variables': { |
| 8 'skia_warnings_as_errors': 0, | 8 'skia_warnings_as_errors': 0, |
| 9 }, | 9 }, |
| 10 'targets': [ | 10 'targets': [ |
| 11 { | 11 { |
| 12 'target_name': 'libpng', | 12 'target_name': 'libpng', |
| 13 'type': 'none', | 13 'type': 'none', |
| 14 'conditions': [ | 14 'conditions': [ |
| 15 [ 'skia_os == "android"', { | |
| 16 'dependencies': [ 'android_deps.gyp:png' ], | |
| 17 'export_dependent_settings': [ 'android_deps.gyp:png' ], | |
| 18 },{ | |
| 19 'dependencies': [ 'libpng.gyp:libpng_static' ], | |
| 20 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], | |
| 21 }] | |
| 22 ] | |
| 23 }, | |
| 24 { | |
| 25 'target_name': 'libpng_static_when_possible', | |
| 26 'type': 'none', | |
| 27 'conditions': [ | |
| 28 [ 'skia_android_framework', { | 15 [ 'skia_android_framework', { |
| 29 'dependencies': [ 'android_deps.gyp:png' ], | 16 'dependencies': [ 'android_deps.gyp:png' ], |
| 30 'export_dependent_settings': [ 'android_deps.gyp:png' ], | 17 'export_dependent_settings': [ 'android_deps.gyp:png' ], |
| 31 },{ | 18 },{ |
| 32 'dependencies': [ 'libpng.gyp:libpng_static' ], | 19 'dependencies': [ 'libpng.gyp:libpng_static' ], |
| 33 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], | 20 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], |
| 34 }] | 21 }] |
| 35 ] | 22 ] |
| 36 }, | 23 }, |
| 37 { | 24 { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 'conditions': [ | 99 'conditions': [ |
| 113 ['arm_neon_optional', { | 100 ['arm_neon_optional', { |
| 114 'cflags': [ | 101 'cflags': [ |
| 115 '-mfpu=neon', | 102 '-mfpu=neon', |
| 116 ], | 103 ], |
| 117 }], | 104 }], |
| 118 ], | 105 ], |
| 119 } | 106 } |
| 120 ] | 107 ] |
| 121 } | 108 } |
| OLD | NEW |