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

Side by Side Diff: gyp/common_conditions.gypi

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 # suppressions below here were added for clang 123 # suppressions below here were added for clang
124 '-Wno-unused-parameter', 124 '-Wno-unused-parameter',
125 '-Wno-c++11-extensions' 125 '-Wno-c++11-extensions'
126 ], 126 ],
127 'conditions' : [ 127 'conditions' : [
128 [ 'skia_warnings_as_errors', { 128 [ 'skia_warnings_as_errors', {
129 'cflags': [ 129 'cflags': [
130 '-Werror', 130 '-Werror',
131 ], 131 ],
132 }], 132 }],
133 [ 'skia_shared_lib', {
134 'cflags': [
135 '-fPIC',
136 ],
137 'defines': [
138 'GR_DLL=1',
139 'GR_IMPLEMENTATION=1',
140 'SKIA_DLL',
141 'SKIA_IMPLEMENTATION=1',
142 ],
143 }],
djsollen 2013/05/30 20:35:29 remove this to make it clear that we don't support
133 [ 'skia_arch_width == 64', { 144 [ 'skia_arch_width == 64', {
134 'cflags': [ 145 'cflags': [
135 '-m64', 146 '-m64',
136 ], 147 ],
137 'ldflags': [ 148 'ldflags': [
138 '-m64', 149 '-m64',
139 ], 150 ],
140 }], 151 }],
141 [ 'skia_arch_width == 32', { 152 [ 'skia_arch_width == 32', {
142 'cflags': [ 153 'cflags': [
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 'ARCHS': ['i386'], 197 'ARCHS': ['i386'],
187 }, 198 },
188 }], 199 }],
189 [ 'skia_warnings_as_errors', { 200 [ 'skia_warnings_as_errors', {
190 'xcode_settings': { 201 'xcode_settings': {
191 'OTHER_CPLUSPLUSFLAGS': [ 202 'OTHER_CPLUSPLUSFLAGS': [
192 '-Werror', 203 '-Werror',
193 ], 204 ],
194 }, 205 },
195 }], 206 }],
207 [ 'skia_shared_lib', {
208 'xcode_settings': {
209 'OTHER_CPLUSPLUSFLAGS': [
210 '-fpic',
211 ],
212 },
213 'defines': [
214 'GR_DLL=1',
215 'GR_IMPLEMENTATION=1',
216 'SKIA_DLL',
217 'SKIA_IMPLEMENTATION=1',
218 ],
djsollen 2013/05/30 20:35:29 remove this to make it clear that we don't support
219 }],
196 ], 220 ],
197 'configurations': { 221 'configurations': {
198 'Debug': { 222 'Debug': {
199 'xcode_settings': { 223 'xcode_settings': {
200 'GCC_OPTIMIZATION_LEVEL': '0', 224 'GCC_OPTIMIZATION_LEVEL': '0',
201 }, 225 },
202 }, 226 },
203 'Release': { 227 'Release': {
204 'xcode_settings': { 228 'xcode_settings': {
205 'GCC_OPTIMIZATION_LEVEL': '3', 229 'GCC_OPTIMIZATION_LEVEL': '3',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 'SK_BUILD_FOR_IOS', 276 'SK_BUILD_FOR_IOS',
253 ], 277 ],
254 'conditions' : [ 278 'conditions' : [
255 [ 'skia_warnings_as_errors', { 279 [ 'skia_warnings_as_errors', {
256 'xcode_settings': { 280 'xcode_settings': {
257 'OTHER_CPLUSPLUSFLAGS': [ 281 'OTHER_CPLUSPLUSFLAGS': [
258 '-Werror', 282 '-Werror',
259 ], 283 ],
260 }, 284 },
261 }], 285 }],
286 [ 'skia_shared_lib', {
287 'xcode_settings': {
288 'OTHER_CPLUSPLUSFLAGS': [
289 '-fpic',
290 ],
291 },
292 'defines': [
293 'GR_DLL=1',
294 'GR_IMPLEMENTATION=1',
295 'SKIA_DLL',
296 'SKIA_IMPLEMENTATION=1',
297 ],
298 }],
djsollen 2013/05/30 20:35:29 remove this to make it clear that we don't support
262 ], 299 ],
263 'configurations': { 300 'configurations': {
264 'Debug': { 301 'Debug': {
265 'xcode_settings': { 302 'xcode_settings': {
266 'GCC_OPTIMIZATION_LEVEL': '0', 303 'GCC_OPTIMIZATION_LEVEL': '0',
267 }, 304 },
268 }, 305 },
269 'Release': { 306 'Release': {
270 'xcode_settings': { 307 'xcode_settings': {
271 'GCC_OPTIMIZATION_LEVEL': '3', 308 'GCC_OPTIMIZATION_LEVEL': '3',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 ], 356 ],
320 'conditions': [ 357 'conditions': [
321 [ 'skia_warnings_as_errors', { 358 [ 'skia_warnings_as_errors', {
322 'cflags': [ 359 'cflags': [
323 '-Werror', 360 '-Werror',
324 ], 361 ],
325 }], 362 }],
326 [ 'skia_profile_enabled == 1', { 363 [ 'skia_profile_enabled == 1', {
327 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 364 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
328 }], 365 }],
366 [ 'skia_shared_lib', {
367 'cflags': [
368 '-fPIC',
369 ],
370 'defines': [
371 'GR_DLL=1',
372 'GR_IMPLEMENTATION=1',
373 'SKIA_DLL',
374 'SKIA_IMPLEMENTATION=1',
375 ],
376 }],
329 [ 'skia_arch_type == "arm" and arm_thumb == 1', { 377 [ 'skia_arch_type == "arm" and arm_thumb == 1', {
330 'cflags': [ 378 'cflags': [
331 '-mthumb', 379 '-mthumb',
332 ], 380 ],
333 }], 381 }],
334 [ 'skia_arch_type == "arm" and armv7 == 1', { 382 [ 'skia_arch_type == "arm" and armv7 == 1', {
335 'variables': { 383 'variables': {
336 'arm_neon_optional%': 0, 384 'arm_neon_optional%': 0,
337 }, 385 },
338 'defines': [ 386 'defines': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 'xcode_settings': { 426 'xcode_settings': {
379 'SYMROOT': '<(DEPTH)/xcodebuild', 427 'SYMROOT': '<(DEPTH)/xcodebuild',
380 }, 428 },
381 } 429 }
382 430
383 # Local Variables: 431 # Local Variables:
384 # tab-width:2 432 # tab-width:2
385 # indent-tabs-mode:nil 433 # indent-tabs-mode:nil
386 # End: 434 # End:
387 # vim: set expandtab tabstop=2 shiftwidth=2: 435 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gyp/bench.gyp ('k') | gyp/common_variables.gypi » ('j') | gyp/core.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698