diff options
| author | sdefresne <sdefresne@chromium.org> | 2014-12-09 03:15:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-09 11:15:23 +0000 |
| commit | 6c0617d8f5f8a8b5ace9f73079b28b9d22066b7a (patch) | |
| tree | a7db29c60803ac149b60be01ec8a219c8b0a8915 /third_party/libwebp | |
| parent | ad86c01a60c33e6b79c141203b7bb26696e7fed6 (diff) | |
| download | chromium_src-6c0617d8f5f8a8b5ace9f73079b28b9d22066b7a.zip chromium_src-6c0617d8f5f8a8b5ace9f73079b28b9d22066b7a.tar.gz chromium_src-6c0617d8f5f8a8b5ace9f73079b28b9d22066b7a.tar.bz2 | |
Enable compilation of libwebp_dsp_neon on iOS
iOS build system generates all build files from the same gyp configuration
and does not set target_arch (as compatibility with Xcode is required). On
that OS enable libwebp_dsp_neon inconditionally.
BUG=None
Review URL: https://codereview.chromium.org/754263003
Cr-Commit-Position: refs/heads/master@{#307447}
Diffstat (limited to 'third_party/libwebp')
| -rw-r--r-- | third_party/libwebp/libwebp.gyp | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/third_party/libwebp/libwebp.gyp b/third_party/libwebp/libwebp.gyp index 01c6510..4b8b45f9e 100644 --- a/third_party/libwebp/libwebp.gyp +++ b/third_party/libwebp/libwebp.gyp @@ -3,14 +3,6 @@ # found in the LICENSE file. { - 'variables': { - 'neon_sources': [ - 'dsp/dec_neon.c', - 'dsp/enc_neon.c', - 'dsp/lossless_neon.c', - 'dsp/upsampling_neon.c', - ] - }, 'targets': [ { 'target_name': 'libwebp_dec', @@ -83,29 +75,31 @@ { 'target_name': 'libwebp_dsp_neon', 'conditions': [ - ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { + # iOS uses the same project to generate build project for both device + # and simulator and do not use "target_arch" variable. Other platform + # set it correctly. + ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)) or (target_arch == "arm64")', { 'type': 'static_library', 'include_dirs': ['.'], 'sources': [ - '<@(neon_sources)' + 'dsp/dec_neon.c', + 'dsp/enc_neon.c', + 'dsp/lossless_neon.c', + 'dsp/upsampling_neon.c', ], - # behavior similar to *.c.neon in an Android.mk - 'cflags!': [ '-mfpu=vfpv3-d16' ], - 'cflags': [ '-mfpu=neon' ], - },{ 'conditions': [ + ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { + # behavior similar to *.c.neon in an Android.mk + 'cflags!': [ '-mfpu=vfpv3-d16' ], + 'cflags': [ '-mfpu=neon' ], + }], ['target_arch == "arm64"', { - 'type': 'static_library', - 'include_dirs': ['.'], - 'sources': [ - '<@(neon_sources)' - ], # avoid an ICE with gcc-4.9: b/15574841 'cflags': [ '-frename-registers' ], - },{ # "target_arch != "arm|arm64" or arm_version < 7" - 'type': 'none', }], - ], + ] + }, { + 'type': 'none', }], ['order_profiling != 0', { 'target_conditions' : [ |