OLD | NEW |
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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 '-mfloat-abi=softfp', | 242 '-mfloat-abi=softfp', |
243 ], | 243 ], |
244 }], | 244 }], |
245 ], | 245 ], |
246 }], | 246 }], |
247 ], | 247 ], |
248 }, | 248 }, |
249 ], | 249 ], |
250 | 250 |
251 ['skia_android_framework', { | 251 ['skia_android_framework', { |
| 252 'includes' : [ |
| 253 'skia_for_android_framework_defines.gypi', |
| 254 ], |
252 'cflags': [ | 255 'cflags': [ |
253 # Skia does not enforce this usage pattern so we disable it here to avoi
d | 256 # Skia does not enforce this usage pattern so we disable it here to avoi
d |
254 # unecessary log spew when building | 257 # unecessary log spew when building |
255 '-Wno-unused-parameter', | 258 '-Wno-unused-parameter', |
256 | 259 |
257 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri
ng. | 260 # Android's -D_FORTIFY_SOURCE=2 extensions are incompatibile with SkStri
ng. |
258 # Revert to -D_FORTIFY_SOURCE=1 | 261 # Revert to -D_FORTIFY_SOURCE=1 |
259 '-U_FORTIFY_SOURCE', | 262 '-U_FORTIFY_SOURCE', |
260 '-D_FORTIFY_SOURCE=1', | 263 '-D_FORTIFY_SOURCE=1', |
261 ], | 264 ], |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 'SkLONGLONG int64_t', | 309 'SkLONGLONG int64_t', |
307 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', | 310 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', |
308 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', | 311 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', |
309 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', | 312 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', |
310 # Still need to switch Android to the new name for N32. | 313 # Still need to switch Android to the new name for N32. |
311 'kNative_8888_SkColorType kN32_SkColorType', | 314 'kNative_8888_SkColorType kN32_SkColorType', |
312 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', | 315 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', |
313 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', | 316 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', |
314 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', | 317 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', |
315 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', | 318 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', |
316 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE', | |
317 'SK_SUPPORT_LEGACY_SETCONFIG_INFO', | |
318 # Needed until we fix skbug.com/2440. | |
319 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', | |
320 # Transitional, for deprecated SkCanvas::SaveFlags methods. | |
321 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', | |
322 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', | |
323 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', | 319 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', |
| 320 # Defines from skia_for_android_framework_defines.gypi |
| 321 '<@(skia_for_android_framework_defines)', |
324 ], | 322 ], |
325 }], | 323 }], |
326 | 324 |
327 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', | 325 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]
', |
328 { | 326 { |
329 'defines': [ | 327 'defines': [ |
330 'SK_SAMPLES_FOR_X', | 328 'SK_SAMPLES_FOR_X', |
331 'SK_BUILD_FOR_UNIX', | 329 'SK_BUILD_FOR_UNIX', |
332 ], | 330 ], |
333 'configurations': { | 331 'configurations': { |
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
656 'SK_BUILD_JSON_WRITER', | 654 'SK_BUILD_JSON_WRITER', |
657 ] | 655 ] |
658 }], | 656 }], |
659 | 657 |
660 ], # end 'conditions' | 658 ], # end 'conditions' |
661 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 659 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
662 'xcode_settings': { | 660 'xcode_settings': { |
663 'SYMROOT': '<(DEPTH)/xcodebuild', | 661 'SYMROOT': '<(DEPTH)/xcodebuild', |
664 }, | 662 }, |
665 } | 663 } |
OLD | NEW |