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

Side by Side Diff: gyp/android_deps.gyp

Issue 1038863003: WIP: Added support for giflib, updated jpeg and png (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Merge Created 5 years, 8 months 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 | « DEPS ('k') | gyp/chromeos_deps.gyp » ('j') | 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 # 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
6 # 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
7 # distribution so we have to build a few of them ourselves. 8 # distribution so we have to build a few of them ourselves.
8 # 9 #
9 # 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
10 # the Skia repo, but that resulted in the generated makefiles being created 11 # the Skia repo, but that resulted in the generated makefiles being created
11 # outside of the intended output directory. So to avoid this we created a simple 12 # outside of the intended output directory. So to avoid this we created a simple
12 # shim here that includes the android_deps.gypi file. The actual dependencies 13 # shim here that includes the android_deps.gypi file. The actual dependencies
13 # are defined and maintained in that gypi file. 14 # are defined and maintained in that gypi file.
14 # 15 #
(...skipping 17 matching lines...) Expand all
32 { 33 {
33 'target_name': 'expat', 34 'target_name': 'expat',
34 'type': 'none', 35 'type': 'none',
35 'direct_dependent_settings': { 36 'direct_dependent_settings': {
36 'libraries' : [ 37 'libraries' : [
37 '-lexpat', 38 '-lexpat',
38 ], 39 ],
39 }, 40 },
40 }, 41 },
41 { 42 {
42 'target_name': 'gif',
43 'type': 'none',
44 'direct_dependent_settings': {
45 'libraries' : [
46 'libgif.a',
47 ],
48 'include_dirs': [
49 'external/giflib',
50 ],
51 },
52 },
53 {
54 'target_name': 'png', 43 'target_name': 'png',
55 'type': 'none', 44 'type': 'none',
56 'direct_dependent_settings': { 45 'direct_dependent_settings': {
57 'libraries' : [ 46 'libraries' : [
58 '-lpng', 47 '-lpng',
59 ], 48 ],
60 'include_dirs': [ 49 'include_dirs': [
61 'external/libpng', 50 'external/libpng',
62 ], 51 ],
63 }, 52 },
(...skipping 12 matching lines...) Expand all
76 }, 65 },
77 { 66 {
78 'target_name': 'cpu_features', 67 'target_name': 'cpu_features',
79 'type': 'none', 68 'type': 'none',
80 }, 69 },
81 ], 70 ],
82 } 71 }
83 ], 72 ],
84 ], 73 ],
85 } 74 }
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/chromeos_deps.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698