| 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"', | 15 [ 'skia_os == "android"', { |
| 16 { | 16 'dependencies': [ 'android_deps.gyp:png' ], |
| 17 'dependencies': [ | 17 'export_dependent_settings': [ 'android_deps.gyp:png' ], |
| 18 'android_deps.gyp:png', | 18 },{ |
| 19 ], | 19 'dependencies': [ 'libpng.gyp:libpng_static' ], |
| 20 'export_dependent_settings': [ | 20 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], |
| 21 'android_deps.gyp:png', | 21 }] |
| 22 ], | |
| 23 }, { # skia_os != "android" | |
| 24 'dependencies': [ | |
| 25 'libpng.gyp:libpng_static', | |
| 26 ], | |
| 27 'export_dependent_settings': [ | |
| 28 'libpng.gyp:libpng_static', | |
| 29 ], | |
| 30 } | |
| 31 ] | |
| 32 ] | 22 ] |
| 33 }, | 23 }, |
| 34 { | 24 { |
| 25 'target_name': 'libpng_static_when_possible', |
| 26 'type': 'none', |
| 27 'conditions': [ |
| 28 [ 'skia_android_framework', { |
| 29 'dependencies': [ 'android_deps.gyp:png' ], |
| 30 'export_dependent_settings': [ 'android_deps.gyp:png' ], |
| 31 },{ |
| 32 'dependencies': [ 'libpng.gyp:libpng_static' ], |
| 33 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], |
| 34 }] |
| 35 ] |
| 36 }, |
| 37 { |
| 35 'target_name': 'libpng_static', | 38 'target_name': 'libpng_static', |
| 36 'type': 'static_library', | 39 'type': 'static_library', |
| 37 'standalone_static_library': 1, | 40 'standalone_static_library': 1, |
| 38 'include_dirs': [ | 41 'include_dirs': [ |
| 39 # Needed for generated pnglibconf.h and pngprefix.h | 42 # Needed for generated pnglibconf.h and pngprefix.h |
| 40 '../third_party/libpng', | 43 '../third_party/libpng', |
| 41 '../third_party/externals/libpng', | 44 '../third_party/externals/libpng', |
| 42 ], | 45 ], |
| 43 'dependencies': [ | 46 'dependencies': [ |
| 44 'zlib.gyp:zlib', | 47 'zlib.gyp:zlib', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 '../third_party/externals/libpng/pngwrite.c', | 79 '../third_party/externals/libpng/pngwrite.c', |
| 77 '../third_party/externals/libpng/pngwtran.c', | 80 '../third_party/externals/libpng/pngwtran.c', |
| 78 '../third_party/externals/libpng/pngwutil.c', | 81 '../third_party/externals/libpng/pngwutil.c', |
| 79 ], | 82 ], |
| 80 'conditions': [ | 83 'conditions': [ |
| 81 [ 'skia_os == "ios"', { | 84 [ 'skia_os == "ios"', { |
| 82 # explicitly disable looking for NEON on iOS builds | 85 # explicitly disable looking for NEON on iOS builds |
| 83 'defines': [ | 86 'defines': [ |
| 84 'PNG_ARM_NEON_OPT=0', | 87 'PNG_ARM_NEON_OPT=0', |
| 85 ], | 88 ], |
| 86 }, { # skia_os != "ios" | 89 }, { # skia_os != "ios" |
| 87 'dependencies': [ | 90 'dependencies': [ |
| 88 'libpng.gyp:libpng_static_neon', | 91 'libpng.gyp:libpng_static_neon', |
| 89 ], | 92 ], |
| 90 }], | 93 }], |
| 91 ], | 94 ], |
| 92 }, | 95 }, |
| 93 { | 96 { |
| 94 'target_name': 'libpng_static_neon', | 97 'target_name': 'libpng_static_neon', |
| 95 'type': 'static_library', | 98 'type': 'static_library', |
| 96 'include_dirs': [ | 99 'include_dirs': [ |
| (...skipping 12 matching lines...) Expand all Loading... |
| 109 'conditions': [ | 112 'conditions': [ |
| 110 ['arm_neon_optional', { | 113 ['arm_neon_optional', { |
| 111 'cflags': [ | 114 'cflags': [ |
| 112 '-mfpu=neon', | 115 '-mfpu=neon', |
| 113 ], | 116 ], |
| 114 }], | 117 }], |
| 115 ], | 118 ], |
| 116 } | 119 } |
| 117 ] | 120 ] |
| 118 } | 121 } |
| OLD | NEW |