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

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: rebase 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 | src/ports/SkAtomics_sync.h » ('j') | src/ports/SkAtomics_sync.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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 'SK_USE_FREETYPE_EMBOLDEN', 356 'SK_USE_FREETYPE_EMBOLDEN',
357 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', 357 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
358 # When built as part of the system image we can enable certian non-NDK 358 # When built as part of the system image we can enable certian non-NDK
359 # compliant optimizations. 359 # compliant optimizations.
360 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 360 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
361 # Optimizations for chromium (m30) 361 # Optimizations for chromium (m30)
362 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 362 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
363 'IGNORE_ROT_AA_RECT_OPT', 363 'IGNORE_ROT_AA_RECT_OPT',
364 'SkLONGLONG int64_t', 364 'SkLONGLONG int64_t',
365 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 365 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
366 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
367 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
368 # Transitional, for deprecated SkCanvas::SaveFlags methods. 366 # Transitional, for deprecated SkCanvas::SaveFlags methods.
369 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 367 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
370 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 368 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
371 'SK_IGNORE_ETC1_SUPPORT', 369 'SK_IGNORE_ETC1_SUPPORT',
372 # Defines from skia_for_android_framework_defines.gypi 370 # Defines from skia_for_android_framework_defines.gypi
373 '<@(skia_for_android_framework_defines)', 371 '<@(skia_for_android_framework_defines)',
374 ], 372 ],
375 }], 373 }],
376 374
377 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ', 375 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"] ',
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 [ 'skia_crash_handler', { 689 [ 'skia_crash_handler', {
692 'defines': [ 'SK_CRASH_HANDLER' ], 690 'defines': [ 'SK_CRASH_HANDLER' ],
693 }], 691 }],
694 692
695 ], # end 'conditions' 693 ], # end 'conditions'
696 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 694 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
697 'xcode_settings': { 695 'xcode_settings': {
698 'SYMROOT': '<(DEPTH)/xcodebuild', 696 'SYMROOT': '<(DEPTH)/xcodebuild',
699 }, 697 },
700 } 698 }
OLDNEW
« no previous file with comments | « no previous file | src/ports/SkAtomics_sync.h » ('j') | src/ports/SkAtomics_sync.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698