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

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: rebasing 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
« no previous file with comments | « gyp/common.gypi ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 ], 319 ],
320 'conditions': [ 320 'conditions': [
321 [ 'skia_warnings_as_errors', { 321 [ 'skia_warnings_as_errors', {
322 'cflags': [ 322 'cflags': [
323 '-Werror', 323 '-Werror',
324 ], 324 ],
325 }], 325 }],
326 [ 'skia_profile_enabled == 1', { 326 [ 'skia_profile_enabled == 1', {
327 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], 327 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'],
328 }], 328 }],
329 [ 'skia_shared_lib', {
330 'cflags': [
331 '-fPIC',
332 ],
333 'defines': [
334 'GR_DLL=1',
335 'GR_IMPLEMENTATION=1',
336 'SKIA_DLL',
337 'SKIA_IMPLEMENTATION=1',
338 ],
339 }],
329 [ 'skia_arch_type == "arm" and arm_thumb == 1', { 340 [ 'skia_arch_type == "arm" and arm_thumb == 1', {
330 'cflags': [ 341 'cflags': [
331 '-mthumb', 342 '-mthumb',
332 ], 343 ],
333 }], 344 }],
334 [ 'skia_arch_type == "arm" and armv7 == 1', { 345 [ 'skia_arch_type == "arm" and armv7 == 1', {
335 'variables': { 346 'variables': {
336 'arm_neon_optional%': 0, 347 'arm_neon_optional%': 0,
337 }, 348 },
338 'defines': [ 349 'defines': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 'xcode_settings': { 389 'xcode_settings': {
379 'SYMROOT': '<(DEPTH)/xcodebuild', 390 'SYMROOT': '<(DEPTH)/xcodebuild',
380 }, 391 },
381 } 392 }
382 393
383 # Local Variables: 394 # Local Variables:
384 # tab-width:2 395 # tab-width:2
385 # indent-tabs-mode:nil 396 # indent-tabs-mode:nil
386 # End: 397 # End:
387 # vim: set expandtab tabstop=2 shiftwidth=2: 398 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « gyp/common.gypi ('k') | gyp/common_variables.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698