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

Side by Side Diff: gyp/common_conditions.gypi

Issue 398153002: Fix broken android framework builds where 32-bit MIPS compilers lack 64-bit __sync operators. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: cleanup Created 6 years, 5 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 | include/core/SkPostConfig.h » ('j') | include/core/SkPostConfig.h » ('J')
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 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 'SK_USE_FREETYPE_EMBOLDEN', 359 'SK_USE_FREETYPE_EMBOLDEN',
360 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', 360 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
361 # When built as part of the system image we can enable certian non-NDK 361 # When built as part of the system image we can enable certian non-NDK
362 # compliant optimizations. 362 # compliant optimizations.
363 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 363 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
364 # Optimizations for chromium (m30) 364 # Optimizations for chromium (m30)
365 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 365 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
366 'IGNORE_ROT_AA_RECT_OPT', 366 'IGNORE_ROT_AA_RECT_OPT',
367 'SkLONGLONG int64_t', 367 'SkLONGLONG int64_t',
368 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 368 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
369 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
370 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
371 # Transitional, for deprecated SkCanvas::SaveFlags methods. 369 # Transitional, for deprecated SkCanvas::SaveFlags methods.
372 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 370 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
373 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', 371 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
374 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 372 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
375 'SK_IGNORE_ETC1_SUPPORT', 373 'SK_IGNORE_ETC1_SUPPORT',
376 # Defines from skia_for_android_framework_defines.gypi 374 # Defines from skia_for_android_framework_defines.gypi
377 '<@(skia_for_android_framework_defines)', 375 '<@(skia_for_android_framework_defines)',
378 ], 376 ],
379 }], 377 }],
380 378
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 [ 'skia_crash_handler', { 693 [ 'skia_crash_handler', {
696 'defines': [ 'SK_CRASH_HANDLER' ], 694 'defines': [ 'SK_CRASH_HANDLER' ],
697 }], 695 }],
698 696
699 ], # end 'conditions' 697 ], # end 'conditions'
700 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 698 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
701 'xcode_settings': { 699 'xcode_settings': {
702 'SYMROOT': '<(DEPTH)/xcodebuild', 700 'SYMROOT': '<(DEPTH)/xcodebuild',
703 }, 701 },
704 } 702 }
OLDNEW
« no previous file with comments | « no previous file | include/core/SkPostConfig.h » ('j') | include/core/SkPostConfig.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698