diff options
author | thakis <thakis@chromium.org> | 2015-06-05 13:57:32 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 20:59:06 +0000 |
commit | 1281ac7b9bdc8979652725a57474f82d9e1145fe (patch) | |
tree | 2c88f8c9d7f9eeb99b26fff735e47307a9396e81 /skia/skia.gyp | |
parent | ed24c2ca28e1f77957f63f6406f86a047a77b8b1 (diff) | |
download | chromium_src-1281ac7b9bdc8979652725a57474f82d9e1145fe.zip chromium_src-1281ac7b9bdc8979652725a57474f82d9e1145fe.tar.gz chromium_src-1281ac7b9bdc8979652725a57474f82d9e1145fe.tar.bz2 |
skia: Simplify SSE2 logic a bit.
Chrome builds with -msse2 globally these days, so remove the skia_chrome_opts
target and fold it into skia_chrome. Keep skia_opts but simplify the
comments there a bit.
No intended behavior change.
BUG=496512,348761
Review URL: https://codereview.chromium.org/1161853008
Cr-Commit-Position: refs/heads/master@{#333129}
Diffstat (limited to 'skia/skia.gyp')
-rw-r--r-- | skia/skia.gyp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 756baf7..8c0536b 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -88,37 +88,6 @@ # targets that are not dependent upon the component type 'targets': [ { - 'target_name': 'skia_chrome_opts', - 'type': 'static_library', - 'include_dirs': [ - '..', - 'config', - '../third_party/skia/include/core', - ], - 'conditions': [ - [ 'os_posix == 1 and OS != "mac" and OS != "android" and \ - target_arch != "arm" and target_arch != "mipsel" and \ - target_arch != "arm64" and target_arch != "mips64el"', { - 'cflags': [ - '-msse2', - ], - }], - [ 'target_arch != "arm" and target_arch != "mipsel" and \ - target_arch != "arm64" and target_arch != "mips64el"', { - 'sources': [ - 'ext/convolver_SSE2.cc', - 'ext/convolver_SSE2.h', - ], - }], - [ 'target_arch == "mipsel" and mips_dsp_rev >= 2',{ - 'sources': [ - 'ext/convolver_mips_dspr2.cc', - 'ext/convolver_mips_dspr2.h', - ], - }], - ], - }, - { 'target_name': 'image_operations_bench', 'type': 'executable', 'dependencies': [ |