diff options
| author | mtklein@chromium.org <mtklein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 18:03:17 +0000 |
|---|---|---|
| committer | mtklein@chromium.org <mtklein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-01 18:03:17 +0000 |
| commit | bdda54ae238fc18c5364a4d8a209a14981335d17 (patch) | |
| tree | d0da207e1826b2f58d9bda2f944db29fbeb91ea4 /skia/skia_library.gypi | |
| parent | 04307e0c502a22c7c07d8bdfd2a8209de64f197b (diff) | |
| download | chromium_src-bdda54ae238fc18c5364a4d8a209a14981335d17.zip chromium_src-bdda54ae238fc18c5364a4d8a209a14981335d17.tar.gz chromium_src-bdda54ae238fc18c5364a4d8a209a14981335d17.tar.bz2 | |
Roll Skia DEPS to 14492
patch from issue 260883004 -- roll
patch from issue 265513005 -- _SSE2 -> _x86
errors on win_chromium_rel and linux_chromium_chromeos_rel look distinctly unrelated to Skia, so
NOTRY=true
Review URL: https://codereview.chromium.org/265763003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 3353b63..fe1793f 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -33,7 +33,7 @@ '../third_party/skia/src/images/SkScaledBitmapSampler.cpp', '../third_party/skia/src/images/SkScaledBitmapSampler.h', - '../third_party/skia/src/opts/opts_check_SSE2.cpp', + '../third_party/skia/src/opts/opts_check_x86.cpp', '../third_party/skia/src/ports/SkFontConfigInterface_android.cpp', '../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp', @@ -187,7 +187,7 @@ [ 'target_arch == "arm" or target_arch == "arm64" or \ target_arch == "mipsel"', { 'sources!': [ - '../third_party/skia/src/opts/opts_check_SSE2.cpp' + '../third_party/skia/src/opts/opts_check_x86.cpp' ], }], [ 'desktop_linux == 1 or chromeos == 1', { @@ -249,7 +249,7 @@ '../third_party/skia/src/utils/mac/SkStream_mac.cpp', ], 'sources/': [ - ['exclude', 'opts_check_SSE2\\.cpp$'], + ['exclude', 'opts_check_x86\\.cpp$'], ], # The main skia_opts target does not currently work on iOS because the |