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

Side by Side Diff: gyp/common_conditions.gypi

Issue 304333002: Remove legacy Picture-recording flags from Android build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: update to ToT Created 6 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
« 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_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 'SK_SUPPORT_ETC1' 9 'SK_SUPPORT_ETC1'
10 ], 10 ],
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 'IGNORE_ROT_AA_RECT_OPT', 306 'IGNORE_ROT_AA_RECT_OPT',
307 # Disable this check because it is too strict for some chromium-specific 307 # Disable this check because it is too strict for some chromium-specific
308 # subclasses of SkPixelRef. See bug: crbug.com/171776. 308 # subclasses of SkPixelRef. See bug: crbug.com/171776.
309 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', 309 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
310 'SkLONGLONG int64_t', 310 'SkLONGLONG int64_t',
311 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 311 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
312 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', 312 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
313 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', 313 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
314 # Still need to switch Android to the new name for N32. 314 # Still need to switch Android to the new name for N32.
315 'kNative_8888_SkColorType kN32_SkColorType', 315 'kNative_8888_SkColorType kN32_SkColorType',
316 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', 316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
317 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', 317 # Needed until we fix skbug.com/2440.
318 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 318 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
319 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', 319 # Transitional, for deprecated SkCanvas::SaveFlags methods.
320 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
321 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
320 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 322 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
321 # Defines from skia_for_android_framework_defines.gypi 323 # Defines from skia_for_android_framework_defines.gypi
322 '<@(skia_for_android_framework_defines)', 324 '<@(skia_for_android_framework_defines)',
323 ], 325 ],
324 }], 326 }],
325 327
326 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 328 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
327 { 329 {
328 'defines': [ 330 'defines': [
329 'SK_SAMPLES_FOR_X', 331 'SK_SAMPLES_FOR_X',
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 'SK_BUILD_JSON_WRITER', 657 'SK_BUILD_JSON_WRITER',
656 ] 658 ]
657 }], 659 }],
658 660
659 ], # end 'conditions' 661 ], # end 'conditions'
660 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 662 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
661 'xcode_settings': { 663 'xcode_settings': {
662 'SYMROOT': '<(DEPTH)/xcodebuild', 664 'SYMROOT': '<(DEPTH)/xcodebuild',
663 }, 665 },
664 } 666 }
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