OLD | NEW |
---|---|
1 # Port-specific Skia library code. | 1 # Port-specific Skia library code. |
2 { | 2 { |
3 'targets': [ | 3 'targets': [ |
4 { | 4 { |
5 'target_name': 'ports', | 5 'target_name': 'ports', |
6 'product_name': 'skia_ports', | 6 'product_name': 'skia_ports', |
7 'type': 'static_library', | 7 'type': 'static_library', |
8 'standalone_static_library': 1, | 8 'standalone_static_library': 1, |
9 'dependencies': [ | 9 'dependencies': [ |
10 'core.gyp:*', | 10 'core.gyp:*', |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 '../src/ports/SkTLS_pthread.cpp', | 52 '../src/ports/SkTLS_pthread.cpp', |
53 '../src/ports/SkTLS_win.cpp', | 53 '../src/ports/SkTLS_win.cpp', |
54 '../src/ports/SkXMLParser_empty.cpp', | 54 '../src/ports/SkXMLParser_empty.cpp', |
55 ], | 55 ], |
56 'conditions': [ | 56 'conditions': [ |
57 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "na cl", "android"]', { | 57 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "na cl", "android"]', { |
58 'sources': [ | 58 'sources': [ |
59 '../src/ports/SkFontHost_FreeType.cpp', | 59 '../src/ports/SkFontHost_FreeType.cpp', |
60 '../src/ports/SkFontHost_FreeType_common.cpp', | 60 '../src/ports/SkFontHost_FreeType_common.cpp', |
61 ], | 61 ], |
62 # FIXME: This needs to be removed when skia_android_framework is set, but it is | |
63 # not being removed by that conditional. Instead, use a separate condi tion to | |
64 # determine whether to add it. | |
65 #'dependencies': [ | |
66 # 'freetype.gyp:freetype', | |
67 #], | |
68 }], | |
69 # FIXME: If this dependency was being removed properly when skia_android _framework is set, this | |
70 # block would be unnecessary. | |
71 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "na cl", "android"] \ | |
72 and skia_android_framework == 0', { | |
djsollen
2014/01/22 21:02:44
not sure I understand what is going on here. Is th
scroggo
2014/01/22 23:52:41
Hmm, I thought so, but it must have been user erro
| |
62 'dependencies': [ | 73 'dependencies': [ |
63 'freetype.gyp:freetype', | 74 'freetype.gyp:freetype', |
64 ], | 75 ], |
65 }], | 76 }], |
66 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { | 77 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { |
67 'link_settings': { | 78 'link_settings': { |
68 'libraries': [ | 79 'libraries': [ |
69 '-lfontconfig', | 80 '-lfontconfig', |
70 '-ldl', | 81 '-ldl', |
71 ], | 82 ], |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
163 '../src/ports/SkDiscardableMemory_ashmem.cpp', | 174 '../src/ports/SkDiscardableMemory_ashmem.cpp', |
164 '../src/ports/SkFontConfigInterface_android.cpp', | 175 '../src/ports/SkFontConfigInterface_android.cpp', |
165 '../src/ports/SkFontConfigParser_android.cpp', | 176 '../src/ports/SkFontConfigParser_android.cpp', |
166 '../src/ports/SkFontHost_fontconfig.cpp', | 177 '../src/ports/SkFontHost_fontconfig.cpp', |
167 '../src/ports/SkPurgeableMemoryBlock_android.cpp', | 178 '../src/ports/SkPurgeableMemoryBlock_android.cpp', |
168 ], | 179 ], |
169 'dependencies': [ | 180 'dependencies': [ |
170 'android_deps.gyp:expat', | 181 'android_deps.gyp:expat', |
171 ], | 182 ], |
172 }], | 183 }], |
184 [ 'skia_android_framework', { | |
185 'include_dirs': [ | |
186 'external/expat/lib', | |
187 'external/freetype/include', | |
188 ], | |
189 # FIXME: This is not removing the dependency. Instead, we do not | |
190 # include it to begin with. | |
191 #'dependencies!': [ | |
192 # 'freetype.gyp:freetype', | |
193 #], | |
194 'libraries' : [ | |
195 '-lft2', | |
196 ], | |
197 }], | |
173 ], | 198 ], |
174 'direct_dependent_settings': { | 199 'direct_dependent_settings': { |
175 'include_dirs': [ | 200 'include_dirs': [ |
176 '../include/ports', | 201 '../include/ports', |
177 ], | 202 ], |
178 }, | 203 }, |
179 }, | 204 }, |
180 ], | 205 ], |
181 } | 206 } |
OLD | NEW |