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

Side by Side Diff: gyp/android_deps.gyp

Issue 2283903003: Expat target exports includes instead of FreeType. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 3 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 | « no previous file | gyp/freetype.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
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 19 matching lines...) Expand all
30 '-Wno-error' 30 '-Wno-error'
31 ], 31 ],
32 'targets': [ 32 'targets': [
33 { 33 {
34 'target_name': 'expat_android', 34 'target_name': 'expat_android',
35 'type': 'none', 35 'type': 'none',
36 'direct_dependent_settings': { 36 'direct_dependent_settings': {
37 'libraries' : [ 37 'libraries' : [
38 '-lexpat', 38 '-lexpat',
39 ], 39 ],
40 'include_dirs': [
41 'external/expat/lib',
42 ],
40 }, 43 },
41 }, 44 },
42 { 45 {
43 'target_name': 'png', 46 'target_name': 'png',
44 'type': 'none', 47 'type': 'none',
45 'direct_dependent_settings': { 48 'direct_dependent_settings': {
46 'libraries' : [ 49 'libraries' : [
47 '-lpng', 50 '-lpng',
48 ], 51 ],
49 'include_dirs': [ 52 'include_dirs': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 }, 92 },
90 { 93 {
91 'target_name': 'cpu_features', 94 'target_name': 'cpu_features',
92 'type': 'none', 95 'type': 'none',
93 }, 96 },
94 ], 97 ],
95 } 98 }
96 ], 99 ],
97 ], 100 ],
98 } 101 }
OLDNEW
« no previous file with comments | « no previous file | gyp/freetype.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698