Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: gyp/android_deps.gyp

Issue 1464423003: Match libjpeg-turbo name change in Android (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 'include_dirs': [ 49 'include_dirs': [
50 'external/libpng', 50 'external/libpng',
51 ], 51 ],
52 }, 52 },
53 }, 53 },
54 { 54 {
55 'target_name': 'libjpeg-turbo', 55 'target_name': 'libjpeg-turbo',
56 'type': 'none', 56 'type': 'none',
57 'direct_dependent_settings': { 57 'direct_dependent_settings': {
58 'libraries' : [ 58 'libraries' : [
59 '-ljpeg-turbo', 59 '-ljpeg',
60 ], 60 ],
61 'include_dirs': [ 61 'include_dirs': [
62 'external/libjpeg-turbo', 62 'external/libjpeg-turbo',
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 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698