Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # GYP file for codec project. | |
| 2 { | |
| 3 'targets': [ | |
| 4 { | |
| 5 'target_name': 'codec', | |
| 6 'product_name': 'skia_codec', | |
| 7 'type': 'static_library', | |
| 8 'standalone_static_library': 1, | |
| 9 'dependencies': [ | |
| 10 'core.gyp:*', | |
| 11 'libjpeg.gyp:*', | |
| 12 'etc1.gyp:libetc1', | |
| 13 'ktx.gyp:libSkKTX', | |
| 14 'libwebp.gyp:libwebp', | |
| 15 'utils.gyp:utils', | |
| 16 ], | |
| 17 'include_dirs': [ | |
| 18 '../include/codec', | |
| 19 '../src/codec', | |
| 20 ], | |
| 21 'sources': [ | |
| 22 '../src/codec/SkCodec.cpp', | |
| 23 '../src/codec/SkCodec_libpng.cpp', | |
| 24 '../src/codec/SkSwizzler.cpp', | |
| 25 ], | |
| 26 'conditions': [ | |
| 27 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "mac ", "ios"]', { | |
|
djsollen
2015/02/25 20:52:15
I think you can remove this condition and the one
scroggo
2015/02/25 21:33:52
Done. This explains my Windows trybot failure, I t
| |
| 28 'dependencies': [ | |
| 29 'libpng.gyp:libpng', | |
|
djsollen
2015/02/25 20:52:15
this gyp file still uses the android_deps.gyp inte
scroggo
2015/02/25 21:33:52
I set it in common_variables.
| |
| 30 ], | |
| 31 }], | |
| 32 [ 'skia_os == "chromeos"', { | |
| 33 'dependencies': [ | |
| 34 'libpng.gyp:libpng', | |
| 35 ], | |
| 36 }], | |
| 37 [ 'skia_os == "ios"', { | |
| 38 'include_dirs': [ | |
| 39 '../include/utils/mac', | |
|
djsollen
2015/02/25 20:52:15
is this needed?
scroggo
2015/02/25 21:33:52
No. Removed.
| |
| 40 ], | |
| 41 }], | |
| 42 ], | |
| 43 'direct_dependent_settings': { | |
| 44 'include_dirs': [ | |
| 45 '../include/codec', | |
| 46 ], | |
| 47 }, | |
| 48 }, | |
| 49 ], | |
| 50 } | |
| OLD | NEW |