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

Side by Side Diff: gyp/common_conditions.gypi

Issue 225283022: Remove duplicate skia_android_framework defines. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 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 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 # draw-time, at which point we know which SkTypeface is being drawn 275 # draw-time, at which point we know which SkTypeface is being drawn
276 'SK_USE_FREETYPE_EMBOLDEN', 276 'SK_USE_FREETYPE_EMBOLDEN',
277 # Android provides at least FreeType 2.4.0 at runtime. 277 # Android provides at least FreeType 2.4.0 at runtime.
278 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400', 278 'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400',
279 # Skia should not use dlopen on Android. 279 # Skia should not use dlopen on Android.
280 'SK_CAN_USE_DLOPEN 0', 280 'SK_CAN_USE_DLOPEN 0',
281 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', 281 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
282 # When built as part of the system image we can enable certian non-NDK 282 # When built as part of the system image we can enable certian non-NDK
283 # compliant optimizations. 283 # compliant optimizations.
284 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 284 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
285 # Android Text Tuning
286 'SK_GAMMA_APPLY_TO_A8',
287 'SK_GAMMA_EXPONENT 1.4',
288 'SK_GAMMA_CONTRAST 0.0',
289 # Optimizations for chromium (m30) 285 # Optimizations for chromium (m30)
290 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 286 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
291 'IGNORE_ROT_AA_RECT_OPT', 287 'IGNORE_ROT_AA_RECT_OPT',
292 # Disable this check because it is too strict for some chromium-specific 288 # Disable this check because it is too strict for some chromium-specific
293 # subclasses of SkPixelRef. See bug: crbug.com/171776. 289 # subclasses of SkPixelRef. See bug: crbug.com/171776.
294 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', 290 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
295 'SkLONGLONG int64_t', 291 'SkLONGLONG int64_t',
296 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 292 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
297 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"', 293 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"',
298 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', 294 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 'defines': [ 607 'defines': [
612 'SK_USE_POSIX_THREADS', 608 'SK_USE_POSIX_THREADS',
613 ], 609 ],
614 }], 610 }],
615 ], # end 'conditions' 611 ], # end 'conditions'
616 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 612 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
617 'xcode_settings': { 613 'xcode_settings': {
618 'SYMROOT': '<(DEPTH)/xcodebuild', 614 'SYMROOT': '<(DEPTH)/xcodebuild',
619 }, 615 },
620 } 616 }
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