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

Side by Side Diff: gyp/common_conditions.gypi

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 | « gm/yuvtorgbeffect.cpp ('k') | include/codec/SkCodec.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # conditions used in both common.gypi and skia.gyp in chromium 5 # conditions used in both common.gypi and skia.gyp in chromium
6 # 6 #
7 { 7 {
8 'defines': [ 8 'defines': [
9 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 9 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
10 'SK_SUPPORT_GPU=<(skia_gpu)', 10 'SK_SUPPORT_GPU=<(skia_gpu)',
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 410 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
411 # Optimizations for chromium (m30) 411 # Optimizations for chromium (m30)
412 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 412 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
413 'IGNORE_ROT_AA_RECT_OPT', 413 'IGNORE_ROT_AA_RECT_OPT',
414 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 414 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
415 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 415 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
416 'SK_IGNORE_ETC1_SUPPORT', 416 'SK_IGNORE_ETC1_SUPPORT',
417 # We can't use the skia_shared_library gyp setting because we need expos e 417 # We can't use the skia_shared_library gyp setting because we need expos e
418 # this define globally and the the implemention define as a cflag. 418 # this define globally and the the implemention define as a cflag.
419 'SKIA_DLL', 419 'SKIA_DLL',
420 'SK_OVERRIDE override', 420 'override override',
421 # Defines from skia_for_android_framework_defines.gypi 421 # Defines from skia_for_android_framework_defines.gypi
422 '<@(skia_for_android_framework_defines)', 422 '<@(skia_for_android_framework_defines)',
423 ], 423 ],
424 }], 424 }],
425 425
426 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 426 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
427 { 427 {
428 'defines': [ 428 'defines': [
429 'SK_SAMPLES_FOR_X', 429 'SK_SAMPLES_FOR_X',
430 'SK_BUILD_FOR_UNIX', 430 'SK_BUILD_FOR_UNIX',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 662 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
663 ], 663 ],
664 }], 664 }],
665 665
666 ], # end 'conditions' 666 ], # end 'conditions'
667 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 667 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
668 'xcode_settings': { 668 'xcode_settings': {
669 'SYMROOT': '<(DEPTH)/xcodebuild', 669 'SYMROOT': '<(DEPTH)/xcodebuild',
670 }, 670 },
671 } 671 }
OLDNEW
« no previous file with comments | « gm/yuvtorgbeffect.cpp ('k') | include/codec/SkCodec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698