summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2013-08-07 14:54:18 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2013-08-07 14:54:18 +0000
commit746ca77315235abb651c35dcc92609bf5f9f35ce (patch)
tree1a47fc6d513871467004d4901578f8b4538a48b3
parent1144aa15a4859b1957ca171a436d1fbb6f22b74d (diff)
parentdccf47acbdb65e21ed989fa3f45e638caffa6ce6 (diff)
downloadgyp-746ca77315235abb651c35dcc92609bf5f9f35ce.tar.gz
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at dccf47acbdb65e21ed989fa3f45e638caffa6ce6
This commit was generated by merge_from_chromium.py. Change-Id: I4a68de303acea7a7fec14be692f2167b3067da70
-rw-r--r--effects.gypi1
-rw-r--r--opts.gyp9
2 files changed, 2 insertions, 8 deletions
diff --git a/effects.gypi b/effects.gypi
index 63857c9..05ce569 100644
--- a/effects.gypi
+++ b/effects.gypi
@@ -22,6 +22,7 @@
'<(skia_src_path)/effects/SkColorFilterImageFilter.cpp',
'<(skia_src_path)/effects/SkColorMatrix.cpp',
'<(skia_src_path)/effects/SkColorMatrixFilter.cpp',
+ '<(skia_src_path)/effects/SkComposeImageFilter.cpp',
'<(skia_src_path)/effects/SkCornerPathEffect.cpp',
'<(skia_src_path)/effects/SkDashPathEffect.cpp',
'<(skia_src_path)/effects/SkDiscretePathEffect.cpp',
diff --git a/opts.gyp b/opts.gyp
index 12c4dc5..8a48b9a 100644
--- a/opts.gyp
+++ b/opts.gyp
@@ -122,14 +122,7 @@
'-mssse3',
],
}],
- # TODO(epoger): the following will enable SSSE3 on Macs, but it will
- # break once we set OTHER_CFLAGS anywhere else (the first setting will
- # be replaced, not added to)
- [ 'skia_os in ["mac"]', {
- 'xcode_settings': {
- 'OTHER_CFLAGS': ['-mssse3',],
- },
- }],
+ # (Mac has -mssse3 globally.)
[ 'skia_arch_type == "x86"', {
'sources': [
'../src/opts/SkBitmapProcState_opts_SSSE3.cpp',