| OLD | NEW |
| 1 # GYP file for images project. | 1 # GYP file for images project. |
| 2 { | 2 { |
| 3 'targets': [ | 3 'targets': [ |
| 4 { | 4 { |
| 5 'target_name': 'images', | 5 'target_name': 'images', |
| 6 'product_name': 'skia_images', | 6 'product_name': 'skia_images', |
| 7 'type': 'static_library', | 7 'type': 'static_library', |
| 8 'standalone_static_library': 1, | 8 'standalone_static_library': 1, |
| 9 'dependencies': [ | 9 'dependencies': [ |
| 10 'core.gyp:*', | 10 'core.gyp:*', |
| 11 'libjpeg.gyp:*', | 11 'libjpeg.gyp:*', |
| 12 'etc1.gyp:*', |
| 12 'libwebp.gyp:libwebp', | 13 'libwebp.gyp:libwebp', |
| 13 'utils.gyp:utils', | 14 'utils.gyp:utils', |
| 14 ], | 15 ], |
| 15 'conditions': [ | 16 'conditions': [ |
| 16 [ 'skia_android_framework == 0', { | 17 [ 'skia_android_framework == 0', { |
| 17 'export_dependent_settings': [ | 18 'export_dependent_settings': [ |
| 18 'libjpeg.gyp:*', | 19 'libjpeg.gyp:*', |
| 19 ], | 20 ], |
| 20 }], | 21 }], |
| 21 ], | 22 ], |
| (...skipping 30 matching lines...) Expand all Loading... |
| 52 # so the right decoders will be forced to link. | 53 # so the right decoders will be forced to link. |
| 53 | 54 |
| 54 # IMPORTANT: The build order of the SkImageDecoder_*.cpp files | 55 # IMPORTANT: The build order of the SkImageDecoder_*.cpp files |
| 55 # defines the order image decoders are tested when decoding a | 56 # defines the order image decoders are tested when decoding a |
| 56 # stream. The last decoder is the first one tested, so the .cpp | 57 # stream. The last decoder is the first one tested, so the .cpp |
| 57 # files should be in listed in order from the least likely to be | 58 # files should be in listed in order from the least likely to be |
| 58 # used, to the most likely (jpeg and png should be the last two | 59 # used, to the most likely (jpeg and png should be the last two |
| 59 # for instance.) As a result, they are deliberately not in | 60 # for instance.) As a result, they are deliberately not in |
| 60 # alphabetical order. | 61 # alphabetical order. |
| 61 '../src/images/SkImageDecoder_wbmp.cpp', | 62 '../src/images/SkImageDecoder_wbmp.cpp', |
| 63 '../src/images/SkImageDecoder_pkm.cpp', |
| 62 '../src/images/SkImageDecoder_libbmp.cpp', | 64 '../src/images/SkImageDecoder_libbmp.cpp', |
| 63 '../src/images/SkImageDecoder_libgif.cpp', | 65 '../src/images/SkImageDecoder_libgif.cpp', |
| 64 '../src/images/SkImageDecoder_libico.cpp', | 66 '../src/images/SkImageDecoder_libico.cpp', |
| 65 '../src/images/SkImageDecoder_libwebp.cpp', | 67 '../src/images/SkImageDecoder_libwebp.cpp', |
| 66 '../src/images/SkImageDecoder_libjpeg.cpp', | 68 '../src/images/SkImageDecoder_libjpeg.cpp', |
| 67 '../src/images/SkImageDecoder_libpng.cpp', | 69 '../src/images/SkImageDecoder_libpng.cpp', |
| 68 | 70 |
| 69 '../src/images/SkImageEncoder.cpp', | 71 '../src/images/SkImageEncoder.cpp', |
| 70 '../src/images/SkImageEncoder_Factory.cpp', | 72 '../src/images/SkImageEncoder_Factory.cpp', |
| 71 '../src/images/SkImageEncoder_argb.cpp', | 73 '../src/images/SkImageEncoder_argb.cpp', |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 }], | 174 }], |
| 173 ], | 175 ], |
| 174 'direct_dependent_settings': { | 176 'direct_dependent_settings': { |
| 175 'include_dirs': [ | 177 'include_dirs': [ |
| 176 '../include/images', | 178 '../include/images', |
| 177 ], | 179 ], |
| 178 }, | 180 }, |
| 179 }, | 181 }, |
| 180 ], | 182 ], |
| 181 } | 183 } |
| OLD | NEW |