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

Side by Side Diff: gyp/freetype.gyp

Issue 833103004: Update Android FreeType version. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update Created 5 years, 1 month 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/freetype.gypi » ('j') | gyp/freetype.gypi » ('J')
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 # Target for building freetype. 5 # Target for building freetype.
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'freetype', 9 'target_name': 'freetype',
10 'type': 'none', 10 'type': 'none',
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 'type': 'static_library', 81 'type': 'static_library',
82 'standalone_static_library': 1, 82 'standalone_static_library': 1,
83 'dependencies': [ 83 'dependencies': [
84 # we are dependent upon PNG for color emoji glyphs 84 # we are dependent upon PNG for color emoji glyphs
85 'libpng.gyp:libpng', 85 'libpng.gyp:libpng',
86 ], 86 ],
87 'includes': [ 87 'includes': [
88 # TODO: merge this back in here? 88 # TODO: merge this back in here?
89 'freetype.gypi', 89 'freetype.gypi',
90 ], 90 ],
91 'include_dirs': [
92 '../third_party/freetype/include_overrides',
93 ],
94 'direct_dependent_settings': {
95 'include_dirs': [
96 '../third_party/freetype/include_overrides',
97 ],
98 },
99 'conditions': [ 91 'conditions': [
100 [ 'skia_os == "android"', { 92 [ 'skia_os == "android"', {
101 # These flags are used by the Android OS. They are probably overkill 93 # These flags are used by the Android OS. They are probably overkill
102 # for Skia, but we add them for consistency. 94 # for Skia, but we add them for consistency.
103 'cflags': [ 95 'cflags': [
104 '-W', 96 '-W',
105 '-Wall', 97 '-Wall',
106 '-fPIC', 98 '-fPIC',
107 '-DPIC', 99 '-DPIC',
108 '-DDARWIN_NO_CARBON', 100 '-DDARWIN_NO_CARBON',
109 '-DFT2_BUILD_LIBRARY', 101 '-DFT2_BUILD_LIBRARY',
110 '-O2', 102 '-O2',
111 ], 103 ],
112 }], 104 }],
113 ], 105 ],
114 }, 106 },
115 ], 107 ],
116 } 108 }
OLDNEW
« no previous file with comments | « DEPS ('k') | gyp/freetype.gypi » ('j') | gyp/freetype.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698