Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 # conditions used in both common.gypi and skia.gyp in chromium | 6 # conditions used in both common.gypi and skia.gyp in chromium |
| 7 # | 7 # |
| 8 { | 8 { |
| 9 'defines': [ | 9 'defines': [ |
| 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', | 10 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', |
| (...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 365 # compliant optimizations. | 365 # compliant optimizations. |
| 366 'SK_BUILD_FOR_ANDROID_FRAMEWORK', | 366 'SK_BUILD_FOR_ANDROID_FRAMEWORK', |
| 367 # Optimizations for chromium (m30) | 367 # Optimizations for chromium (m30) |
| 368 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', | 368 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', |
| 369 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', | 369 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', |
| 370 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', | 370 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', |
| 371 'SK_IGNORE_ETC1_SUPPORT', | 371 'SK_IGNORE_ETC1_SUPPORT', |
| 372 # We can't use the skia_shared_lib gyp setting because we need expose | 372 # We can't use the skia_shared_lib gyp setting because we need expose |
| 373 # this define globally and the the implemention define as a cflag. | 373 # this define globally and the the implemention define as a cflag. |
| 374 'SKIA_DLL', | 374 'SKIA_DLL', |
| 375 'SK_PRINT_CODEC_MESSAGES', | |
|
msarett
2015/11/05 15:05:43
Maybe this doesn't belong with this CL.
But this
scroggo
2015/11/05 18:35:52
FWIW, turning off error printing in libjpeg-turbo
msarett
2015/11/05 22:13:25
I'll make the change in SkJpegCodec in a follow-up
| |
| 376 ], | 375 ], |
| 377 }], | 376 }], |
| 378 | 377 |
| 379 ['skia_use_android_framework_defines', { | 378 ['skia_use_android_framework_defines', { |
| 380 # Add these defines when building for the Android framework, or when | 379 # Add these defines when building for the Android framework, or when |
| 381 # specifically requested. These should be temporary staging defines. Any | 380 # specifically requested. These should be temporary staging defines. Any |
| 382 # permanent defines should be moved into the skia_android_framework block | 381 # permanent defines should be moved into the skia_android_framework block |
| 383 # above. | 382 # above. |
| 384 'includes' : [ | 383 'includes' : [ |
| 385 'skia_for_android_framework_defines.gypi', | 384 'skia_for_android_framework_defines.gypi', |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 632 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], | 631 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], |
| 633 }, | 632 }, |
| 634 }], | 633 }], |
| 635 | 634 |
| 636 ], # end 'conditions' | 635 ], # end 'conditions' |
| 637 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details | 636 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details |
| 638 'xcode_settings': { | 637 'xcode_settings': { |
| 639 'SYMROOT': '<(DEPTH)/xcodebuild', | 638 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 640 }, | 639 }, |
| 641 } | 640 } |
| OLD | NEW |