diff options
| author |  krajcevski <krajcevski@google.com> | 2014-06-02 13:51:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 13:51:34 -0700 |
| commit | 8c111f783f40470e697310244426362132979ad9 (patch) | |
| tree | 5177b93a91ebca50b64f50ca99e3de6cd2073116 /gyp | |
| parent | fc435a020ab057bc2e416c733da9296beb4a1a25 (diff) | |
Change #def to be opt-out
R=jvanverth@google.com, robertphillips@google.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/308143008
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 2 | ||||
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 6dcdca884d..cf46ed21d9 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -6,7 +6,6 @@ 'SK_SUPPORT_GPU=<(skia_gpu)', 'SK_SUPPORT_OPENCL=<(skia_opencl)', 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', - 'SK_SUPPORT_ETC1' ], 'conditions' : [ [ 'skia_arch_type == "arm64"', { @@ -320,6 +319,7 @@ 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', + 'SK_IGNORE_ETC1_SUPPORT', # Defines from skia_for_android_framework_defines.gypi '<@(skia_for_android_framework_defines)', ], diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index 0f4a3f836a..e9003cdf27 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -21,6 +21,7 @@ 'SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE', 'SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS', 'SK_SUPPORT_LEGACY_IMAGEGENERATORAPI', + 'SK_IGNORE_ETC1_SUPPORT', ], }, } |