diff options
| author |  msarett <msarett@google.com> | 2015-08-11 13:32:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-11 13:32:54 -0700 |
| commit | fcaaadee711a93d601ccc9f0b47d744e22c35205 (patch) | |
| tree | c66a9c7142ed524c6596155d301312236987eb00 /platform_tools | |
| parent | 7cdfa8a3f463fb959264df75781f94e3a332b45b (diff) | |
Switching Skia to chromium's libjpeg-turbo
Compile SkJpegCodec and SkImageDecoder_libjpeg with
chromium's libjpeg-turbo. SkImageDecoder_libjpeg still uses
libjpeg on Android and the Android framework. SkJpegCodec is
still not compiled on the Android framework.
BUG=skia:
Review URL: https://codereview.chromium.org/1275773004
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi index fb9e80bb4a..f6298c1558 100644 --- a/platform_tools/android/gyp/dependencies.gypi +++ b/platform_tools/android/gyp/dependencies.gypi @@ -183,18 +183,22 @@ '../third_party/externals/jpeg/jutils.c', ], 'conditions': [ - [ 'arm_neon == 1 and skia_clang_build == 0', - { - 'sources' : [ - '../third_party/externals/jpeg/armv6_idct.S', - '../third_party/externals/jpeg/jsimd_arm_neon.S', - '../third_party/externals/jpeg/jsimd_neon.c', - ], - 'defines' : [ - 'NV_ARM_NEON', - ], - }, - ], + # FIXME (msarett): + # Turn off Arm NEON optimizations to avoid namespace conflicts when + # compiling libjpeg and libjpeg-turbo. This is a temporary step in the + # plan to replace libjpeg with libjpeg-turbo. + #[ 'arm_neon == 1 and skia_clang_build == 0', + # { + # 'sources' : [ + # '../third_party/externals/jpeg/armv6_idct.S', + # '../third_party/externals/jpeg/jsimd_arm_neon.S', + # '../third_party/externals/jpeg/jsimd_neon.c', + # ], + # 'defines' : [ + # 'NV_ARM_NEON', + # ], + # }, + #], [ '"mips" in skia_arch_type and mips_dsp == 2', { 'sources' : [ |