diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-12-05 17:56:21 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-12-05 17:56:21 +0000 |
| commit | 338ece55133fbb6beb4b2aae37506a6dcf3ee618 (patch) | |
| tree | c544755928aa4a6312a8abcc59f28a70ccea0d5c | |
| parent | 61cb580ccdb0d06f045236963383fdbb669db691 (diff) | |
| parent | 671aa50bfb41f6b8300b31b885c39235e445223f (diff) | |
| download | gyp-338ece55133fbb6beb4b2aae37506a6dcf3ee618.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 671aa50bfb41f6b8300b31b885c39235e445223f
This commit was generated by merge_from_chromium.py.
Change-Id: I1017f2dc95b685044d7c04fc968053068da2b0e4
| -rw-r--r-- | cityhash.gyp | 5 | ||||
| -rw-r--r-- | opts.gyp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/cityhash.gyp b/cityhash.gyp deleted file mode 100644 index 461c8cc..0000000 --- a/cityhash.gyp +++ /dev/null @@ -1,5 +0,0 @@ -# Do-nothing gypfile, to keep the buildbots green. -# See https://code.google.com/p/skia/issues/detail?id=1286 -# ('removing cityhash.gyp broke SOME but not ALL buildbots') -{ -} @@ -79,7 +79,6 @@ '../src/opts/SkBlitMask_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.cpp', '../src/opts/SkBlitRow_opts_arm.h', - '../src/opts/SkBlurImage_opts_none.cpp', '../src/opts/SkXfermode_opts_arm.cpp', ], 'conditions': [ @@ -179,6 +178,7 @@ '../src/opts/SkBitmapProcState_matrix_repeat_neon.h', '../src/opts/SkBlitMask_opts_arm_neon.cpp', '../src/opts/SkBlitRow_opts_arm_neon.cpp', + '../src/opts/SkBlurImage_opts_neon.cpp', '../src/opts/SkMorphology_opts_neon.cpp', '../src/opts/SkXfermode_opts_arm_neon.cpp', ], |