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

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: Added conditionals to jpeg and png sources, removed extra giflib 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
OLDNEW
1 # Copyright 2015 Google Inc.
2 #
3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file.
5
1 # 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
2 # 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
3 # distribution so we have to build a few of them ourselves. 8 # distribution so we have to build a few of them ourselves.
4 # 9 #
5 # 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
6 # 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
7 # 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
8 # 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
9 # are defined and maintained in that gypi file. 14 # are defined and maintained in that gypi file.
10 # 15 #
(...skipping 17 matching lines...) Expand all
28 { 33 {
29 'target_name': 'expat', 34 'target_name': 'expat',
30 'type': 'none', 35 'type': 'none',
31 'direct_dependent_settings': { 36 'direct_dependent_settings': {
32 'libraries' : [ 37 'libraries' : [
33 '-lexpat', 38 '-lexpat',
34 ], 39 ],
35 }, 40 },
36 }, 41 },
37 { 42 {
38 'target_name': 'gif',
39 'type': 'none',
40 'direct_dependent_settings': {
41 'libraries' : [
42 'libgif.a',
43 ],
44 'include_dirs': [
45 'external/giflib',
46 ],
47 },
48 },
49 {
50 'target_name': 'png', 43 'target_name': 'png',
51 'type': 'none', 44 'type': 'none',
52 'direct_dependent_settings': { 45 'direct_dependent_settings': {
53 'libraries' : [ 46 'libraries' : [
54 '-lpng', 47 '-lpng',
55 ], 48 ],
56 'include_dirs': [ 49 'include_dirs': [
57 'external/libpng', 50 'external/libpng',
58 ], 51 ],
59 }, 52 },
(...skipping 12 matching lines...) Expand all
72 }, 65 },
73 { 66 {
74 'target_name': 'cpu_features', 67 'target_name': 'cpu_features',
75 'type': 'none', 68 'type': 'none',
76 }, 69 },
77 ], 70 ],
78 } 71 }
79 ], 72 ],
80 ], 73 ],
81 } 74 }
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/common_variables.gypi » ('j') | platform_tools/android/gyp/dependencies.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698