diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 14:19:39 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 14:19:39 +0000 |
| commit | 2b889f8813799a60ab850348c94f935aa0157788 (patch) | |
| tree | b39d3d5a33bb926cc75eadb85717f4685c159f65 /skia/skia_library_opts.gyp | |
| parent | 458d5944c40f518e30b9a4e96b7300caf4882092 (diff) | |
| download | chromium_src-2b889f8813799a60ab850348c94f935aa0157788.zip chromium_src-2b889f8813799a60ab850348c94f935aa0157788.tar.gz chromium_src-2b889f8813799a60ab850348c94f935aa0157788.tar.bz2 | |
Roll Skia DEPS to r10475 (take 3)
R=djsollen@google.com, tomhudson@google.com
Review URL: https://codereview.chromium.org/21550002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library_opts.gyp')
| -rw-r--r-- | skia/skia_library_opts.gyp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index f598361..c87b982 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -49,13 +49,8 @@ '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp', ], - 'conditions': [ - # x86 Android doesn't support SSSE3 instructions. - [ 'OS != "android"', { - 'dependencies': [ - 'skia_opts_ssse3', - ], - }], + 'dependencies': [ + 'skia_opts_ssse3', ], }], [ 'target_arch == "arm"', { @@ -144,7 +139,7 @@ '../third_party/skia/src/core', ], 'conditions': [ - [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { + [ 'OS in ["linux", "freebsd", "openbsd", "solaris", "android"]', { 'cflags': [ '-mssse3', ], |