OLD | NEW |
1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 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 # Copyright 2015 Google Inc. | 5 # Copyright 2015 Google Inc. |
6 # | 6 # |
7 # Use of this source code is governed by a BSD-style license that can be | 7 # Use of this source code is governed by a BSD-style license that can be |
8 # found in the LICENSE file. | 8 # found in the LICENSE file. |
9 | 9 |
10 # GYP file for codec project. | 10 # GYP file for codec project. |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 }, { # !skia_android_framework | 74 }, { # !skia_android_framework |
75 'dependencies': [ | 75 'dependencies': [ |
76 # TODO(msarett): Add libjpeg-turbo to Android so this can be a glo
bal | 76 # TODO(msarett): Add libjpeg-turbo to Android so this can be a glo
bal |
77 # dependency. | 77 # dependency. |
78 'libjpeg-turbo.gyp:libjpeg-turbo', | 78 'libjpeg-turbo.gyp:libjpeg-turbo', |
79 'libpng.gyp:libpng_static', | 79 'libpng.gyp:libpng_static', |
80 ], | 80 ], |
81 'export_dependent_settings': [ | 81 'export_dependent_settings': [ |
82 'libjpeg-turbo.gyp:libjpeg-turbo', | 82 'libjpeg-turbo.gyp:libjpeg-turbo', |
83 ], | 83 ], |
84 'cflags': [ | 84 'defines': [ |
85 '-DTURBO_HAS_SKIP', | 85 'TURBO_HAS_SKIP', |
86 ], | 86 ], |
87 } | 87 } |
88 ] | 88 ] |
89 ] | 89 ] |
90 }, | 90 }, |
91 ], | 91 ], |
92 } | 92 } |
OLD | NEW |