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

Side by Side Diff: gyp/common_conditions.gypi

Issue 868243003: Define SK_OVERRIDE when building for Android framework. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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 | no next file » | 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_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', 8 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 # Optimizations for chromium (m30) 400 # Optimizations for chromium (m30)
401 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 401 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
402 'IGNORE_ROT_AA_RECT_OPT', 402 'IGNORE_ROT_AA_RECT_OPT',
403 'SkLONGLONG int64_t', 403 'SkLONGLONG int64_t',
404 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 404 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
405 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 405 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
406 'SK_IGNORE_ETC1_SUPPORT', 406 'SK_IGNORE_ETC1_SUPPORT',
407 # We can't use the skia_shared_library gyp setting because we need expos e 407 # We can't use the skia_shared_library gyp setting because we need expos e
408 # this define globally and the the implemention define as a cflag. 408 # this define globally and the the implemention define as a cflag.
409 'SKIA_DLL', 409 'SKIA_DLL',
410 'SK_OVERRIDE override',
410 # Defines from skia_for_android_framework_defines.gypi 411 # Defines from skia_for_android_framework_defines.gypi
411 '<@(skia_for_android_framework_defines)', 412 '<@(skia_for_android_framework_defines)',
412 ], 413 ],
413 }], 414 }],
414 415
415 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 416 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
416 { 417 {
417 'defines': [ 418 'defines': [
418 'SK_SAMPLES_FOR_X', 419 'SK_SAMPLES_FOR_X',
419 'SK_BUILD_FOR_UNIX', 420 'SK_BUILD_FOR_UNIX',
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 [ 'skia_is_bot', { 655 [ 'skia_is_bot', {
655 'defines': [ 'SK_CRASH_HANDLER' ], 656 'defines': [ 'SK_CRASH_HANDLER' ],
656 }], 657 }],
657 658
658 ], # end 'conditions' 659 ], # end 'conditions'
659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
660 'xcode_settings': { 661 'xcode_settings': {
661 'SYMROOT': '<(DEPTH)/xcodebuild', 662 'SYMROOT': '<(DEPTH)/xcodebuild',
662 }, 663 },
663 } 664 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698