diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 17:06:34 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 17:06:34 +0000 |
| commit | 2c5d9b957719a0aaa7efed57996888629d16f7a9 (patch) | |
| tree | a1197256997bbd77e9a0cb31ac6c28677de4ba10 /skia/skia.gyp | |
| parent | dd5ee808ed7f5ec3dfe6029483b8692936377979 (diff) | |
| download | chromium_src-2c5d9b957719a0aaa7efed57996888629d16f7a9.zip chromium_src-2c5d9b957719a0aaa7efed57996888629d16f7a9.tar.gz chromium_src-2c5d9b957719a0aaa7efed57996888629d16f7a9.tar.bz2 | |
Fix skia build when not on armv7.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11342016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia.gyp')
| -rw-r--r-- | skia/skia.gyp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index cb016c0..0cd2e35 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -222,7 +222,7 @@ 'GR_AGGRESSIVE_SHADER_OPTS=1', 'SK_DISABLE_FAST_AA_STROKE_RECT', 'SK_DEFERRED_CANVAS_USES_GPIPE=1', - + # this flag can be removed entirely once this has baked for a while 'SK_ALLOW_OVER_32K_BITMAPS', @@ -287,7 +287,7 @@ 'SK_GAMMA_CONTRAST=0.0', ], }], - + # For POSIX platforms, prefer the Mutex implementation provided by Skia # since it does not generate static initializers. [ 'OS == "android" or OS == "linux" or OS == "mac" or OS == "ios"', { @@ -716,9 +716,6 @@ ], 'sources': [ '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp', - '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', - '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', - '../third_party/skia/src/opts/opts_check_arm.cpp', ], }], [ 'armv7 == 1 and arm_neon == 0', { @@ -735,14 +732,19 @@ '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h', '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h', '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp', - ], + ], }], - [ 'target_arch == "arm" and armv7 != 1', { + [ 'target_arch == "arm" and armv7 == 0', { 'sources': [ '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', + '../third_party/skia/src/opts/SkUtils_opts_none.cpp', ], - 'sources!': [ + }], + [ 'target_arch == "arm" and armv7 == 1', { + 'sources': [ '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp', + '../third_party/skia/src/opts/SkBlitRow_opts_arm.h', + '../third_party/skia/src/opts/opts_check_arm.cpp', ], }], ], |