diff options
| author |  djsollen <djsollen@google.com> | 2015-01-27 09:01:01 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-27 09:01:01 -0800 |
| commit | f379ad3429b61eb1d86e916767258340df372538 (patch) | |
| tree | d77b60e1308404eccc9113aec17b12da78cf883d /gyp | |
| parent | f77365f43e74dee617db669369a0eb86c6acc550 (diff) | |
Setup Android framework builds to use the appropriate shared lib defines.
Review URL: https://codereview.chromium.org/864043005
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 394cc6ccf2..dcb0ea8d0a 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -354,6 +354,11 @@ # Revert to -D_FORTIFY_SOURCE=1 '-U_FORTIFY_SOURCE', '-D_FORTIFY_SOURCE=1', + + # We can't use the skia_shared_library gyp setting because we need to + # isolate this define to Skia sources. CFLAGS are local to Android.mk + # and ensures that this define is not exported to clients of the library + '-DSKIA_IMPLEMENTATION=1', ], # Remove flags which are either unnecessary or problematic for the # Android framework build. Many of these flags are removed simply because @@ -399,6 +404,9 @@ 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 'SK_IGNORE_ETC1_SUPPORT', + # We can't use the skia_shared_library gyp setting because we need expose + # this define globally and the the implemention define as a cflag. + 'SKIA_DLL', # Defines from skia_for_android_framework_defines.gypi '<@(skia_for_android_framework_defines)', ], |