diff options
| author |  mtklein <mtklein@chromium.org> | 2015-07-27 12:03:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-27 12:03:23 -0700 |
| commit | 56b78a7a2aa87998e6a3f3d026e2184f1bccaf0c (patch) | |
| tree | ce47323dcb89b9d33b3b58797da6a5ee2da2e9c7 /gyp | |
| parent | 513f2658779d1a6f12b14bc18ef22b25c381a198 (diff) | |
Revert of Lay groundwork for SkOpts. (patchset #3 id:40001 of https://codereview.chromium.org/1255193002/)
Reason for revert:
Chromium doesn't call SkGraphics::Init(). This setup won't work.
Original issue's description:
> Lay groundwork for SkOpts.
>
> This doesn't really do anything yet. It's just the CPU detection code, skeleton new .cpp files, and a few little .gyp tweaks.
>
> BUG=skia:4117
>
> Committed: https://skia.googlesource.com/skia/+/ce2c5055cee5d5d3c9fc84c1b3eeed4b4d84a827
TBR=djsollen@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4117
Review URL: https://codereview.chromium.org/1261743002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/opts.gyp | 1 | ||||
| -rw-r--r-- | gyp/opts.gypi | 5 |
3 files changed, 0 insertions, 7 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 8618324d87..389fca6d61 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -134,7 +134,6 @@ '<(skia_src_path)/core/SkMiniRecorder.cpp', '<(skia_src_path)/core/SkMultiPictureDraw.cpp', '<(skia_src_path)/core/SkNinePatchIter.cpp', - '<(skia_src_path)/core/SkOpts.cpp', '<(skia_src_path)/core/SkPackBits.cpp', '<(skia_src_path)/core/SkPaint.cpp', '<(skia_src_path)/core/SkPaintPriv.cpp', diff --git a/gyp/opts.gyp b/gyp/opts.gyp index 1c767af99b..b4fb609881 100644 --- a/gyp/opts.gyp +++ b/gyp/opts.gyp @@ -105,7 +105,6 @@ 'type': 'static_library', 'standalone_static_library': 1, 'dependencies': [ 'core.gyp:*' ], - 'include_dirs': [ '../src/core' ], 'sources': [ '<@(sse41_sources)' ], 'conditions': [ [ 'skia_os == "win"', { diff --git a/gyp/opts.gypi b/gyp/opts.gypi index 44e57d524c..6d7a796ad9 100644 --- a/gyp/opts.gypi +++ b/gyp/opts.gypi @@ -34,7 +34,6 @@ '<(skia_src_path)/opts/SkTextureCompression_opts_neon.cpp', '<(skia_src_path)/opts/SkUtils_opts_arm_neon.cpp', '<(skia_src_path)/opts/SkXfermode_opts_arm_neon.cpp', - '<(skia_src_path)/opts/SkOpts_neon.cpp', ], 'arm64_sources': [ '<(skia_src_path)/opts/SkBitmapProcState_arm_neon.cpp', @@ -52,7 +51,6 @@ '<(skia_src_path)/opts/SkUtils_opts_none.cpp', '<(skia_src_path)/opts/SkXfermode_opts_arm.cpp', '<(skia_src_path)/opts/SkXfermode_opts_arm_neon.cpp', - '<(skia_src_path)/opts/SkOpts_neon.cpp', ], 'mips_dsp_sources': [ @@ -76,15 +74,12 @@ '<(skia_src_path)/opts/SkUtils_opts_SSE2.cpp', '<(skia_src_path)/opts/SkXfermode_opts_none.cpp', '<(skia_src_path)/opts/opts_check_x86.cpp', - '<(skia_src_path)/opts/SkOpts_sse2.cpp', ], 'ssse3_sources': [ '<(skia_src_path)/opts/SkBitmapProcState_opts_SSSE3.cpp', - '<(skia_src_path)/opts/SkOpts_ssse3.cpp', ], 'sse41_sources': [ '<(skia_src_path)/opts/SkBlurImage_opts_SSE4.cpp', '<(skia_src_path)/opts/SkBlitRow_opts_SSE4.cpp', - '<(skia_src_path)/opts/SkOpts_sse41.cpp', ], } |