| OLD | NEW |
|---|
| 1 { | 1 { |
| 2 'targets': [ | 2 'targets': [ |
| 3 { | 3 { |
| 4 'target_name': 'images', | 4 'target_name': 'images', |
| 5 'product_name': 'skia_images', | 5 'product_name': 'skia_images', |
| 6 'type': 'static_library', | 6 'type': 'static_library', |
| 7 'standalone_static_library': 1, | 7 'standalone_static_library': 1, |
| 8 'dependencies': [ | 8 'dependencies': [ |
| 9 'libjpeg.gyp:*', | 9 'libjpeg.gyp:*', |
| 10 'libwebp.gyp:libwebp', | 10 'libwebp.gyp:libwebp', |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 # end libpng stuff | 117 # end libpng stuff |
| 118 }], | 118 }], |
| 119 [ 'skia_os == "android"', { | 119 [ 'skia_os == "android"', { |
| 120 'include_dirs': [ | 120 'include_dirs': [ |
| 121 '../src/utils', | 121 '../src/utils', |
| 122 ], | 122 ], |
| 123 'dependencies': [ | 123 'dependencies': [ |
| 124 'android_deps.gyp:gif', | 124 'android_deps.gyp:gif', |
| 125 'android_deps.gyp:png', | 125 'android_deps.gyp:png', |
| 126 ], | 126 ], |
| 127 'defines': [ | |
| 128 'SK_ENABLE_LIBPNG', | |
| 129 ], | |
| 130 },{ #else if skia_os != android | 127 },{ #else if skia_os != android |
| 131 'sources!': [ | 128 'sources!': [ |
| 132 '../src/images/SkImageRef_ashmem.h', | 129 '../src/images/SkImageRef_ashmem.h', |
| 133 '../src/images/SkImageRef_ashmem.cpp', | 130 '../src/images/SkImageRef_ashmem.cpp', |
| 134 ], | 131 ], |
| 135 }], | 132 }], |
| 136 [ 'skia_os == "ios"', { | 133 [ 'skia_os == "ios"', { |
| 137 'include_dirs': [ | 134 'include_dirs': [ |
| 138 '../include/utils/mac', | 135 '../include/utils/mac', |
| 139 ], | 136 ], |
| 140 }], | 137 }], |
| 141 ], | 138 ], |
| 142 'direct_dependent_settings': { | 139 'direct_dependent_settings': { |
| 143 'include_dirs': [ | 140 'include_dirs': [ |
| 144 '../include/images', | 141 '../include/images', |
| 145 '../include/lazy', | 142 '../include/lazy', |
| 146 ], | 143 ], |
| 147 }, | 144 }, |
| 148 }, | 145 }, |
| 149 ], | 146 ], |
| 150 } | 147 } |
| 151 | 148 |
| 152 # Local Variables: | 149 # Local Variables: |
| 153 # tab-width:2 | 150 # tab-width:2 |
| 154 # indent-tabs-mode:nil | 151 # indent-tabs-mode:nil |
| 155 # End: | 152 # End: |
| 156 # vim: set expandtab tabstop=2 shiftwidth=2: | 153 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 12958002:
Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android. (Closed)
Base URL: https://skia.googlecode.com/svn/trunk