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

Side by Side Diff: gyp/common_conditions.gypi

Issue 696063006: Reenable deprecation warnings on Android framework. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 | « 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 'SK_USE_FREETYPE_EMBOLDEN', 370 'SK_USE_FREETYPE_EMBOLDEN',
371 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', 371 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
372 # When built as part of the system image we can enable certian non-NDK 372 # When built as part of the system image we can enable certian non-NDK
373 # compliant optimizations. 373 # compliant optimizations.
374 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 374 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
375 # Optimizations for chromium (m30) 375 # Optimizations for chromium (m30)
376 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 376 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
377 'IGNORE_ROT_AA_RECT_OPT', 377 'IGNORE_ROT_AA_RECT_OPT',
378 'SkLONGLONG int64_t', 378 'SkLONGLONG int64_t',
379 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 379 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
380 # Transitional, for deprecated SkCanvas::SaveFlags methods.
381 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
382 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 380 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
383 'SK_IGNORE_ETC1_SUPPORT', 381 'SK_IGNORE_ETC1_SUPPORT',
384 # Defines from skia_for_android_framework_defines.gypi 382 # Defines from skia_for_android_framework_defines.gypi
385 '<@(skia_for_android_framework_defines)', 383 '<@(skia_for_android_framework_defines)',
386 ], 384 ],
387 }], 385 }],
388 386
389 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 387 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
390 { 388 {
391 'defines': [ 389 'defines': [
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 [ 'skia_is_bot', { 631 [ 'skia_is_bot', {
634 'defines': [ 'SK_CRASH_HANDLER' ], 632 'defines': [ 'SK_CRASH_HANDLER' ],
635 }], 633 }],
636 634
637 ], # end 'conditions' 635 ], # end 'conditions'
638 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
639 'xcode_settings': { 637 'xcode_settings': {
640 'SYMROOT': '<(DEPTH)/xcodebuild', 638 'SYMROOT': '<(DEPTH)/xcodebuild',
641 }, 639 },
642 } 640 }
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