Chromium Code Reviews| 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 | 5 |
| 6 # This GYP file stores the dependencies necessary to build Skia on the Android | 6 # This GYP file stores the dependencies necessary to build Skia on the Android |
| 7 # platform. The OS doesn't provide many stable libraries as part of the | 7 # platform. The OS doesn't provide many stable libraries as part of the |
| 8 # distribution so we have to build a few of them ourselves. | 8 # distribution so we have to build a few of them ourselves. |
| 9 # | 9 # |
| 10 # We tried adding this gyp file to the android directory at the root of | 10 # We tried adding this gyp file to the android directory at the root of |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 }, | 52 }, |
| 53 }, | 53 }, |
| 54 { | 54 { |
| 55 'target_name': 'jpeg', | 55 'target_name': 'jpeg', |
| 56 'type': 'none', | 56 'type': 'none', |
| 57 'direct_dependent_settings': { | 57 'direct_dependent_settings': { |
| 58 'libraries' : [ | 58 'libraries' : [ |
| 59 '-ljpeg', | 59 '-ljpeg', |
| 60 ], | 60 ], |
| 61 'include_dirs': [ | 61 'include_dirs': [ |
| 62 'external/jpeg', | 62 #'external/jpeg', |
|
scroggo
2015/04/15 00:31:06
Why this change?
msarett
2015/04/15 12:43:11
Sorry this was not intended. It's fixed.
| |
| 63 ], | 63 ], |
| 64 }, | 64 }, |
| 65 }, | 65 }, |
| 66 { | 66 { |
| 67 'target_name': 'cpu_features', | 67 'target_name': 'cpu_features', |
| 68 'type': 'none', | 68 'type': 'none', |
| 69 }, | 69 }, |
| 70 ], | 70 ], |
| 71 } | 71 } |
| 72 ], | 72 ], |
| 73 ], | 73 ], |
| 74 } | 74 } |
| OLD | NEW |