diff options
| author |  reed <reed@google.com> | 2015-01-05 10:01:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-05 10:01:25 -0800 |
| commit | 40c85e41b8be96f47f03a34bb2938696037afad4 (patch) | |
| tree | 8bbf87e64661d0434a948dd3d7dd7a6a921eff82 /gyp | |
| parent | f1cdead599715dbae30278bffa4528bd1664f61f (diff) | |
Revert of Revert of enable conics gm (patchset #1 id:1 of https://codereview.chromium.org/811863006/)
Reason for revert:
maybe this wasn't the cause of the chromeos crash?
Original issue's description:
> Revert of enable conics gm (patchset #3 id:40001 of https://codereview.chromium.org/835593002/)
>
> Reason for revert:
> did I break the build?
>
> Original issue's description:
> > enable conics gm
> >
> > BUG=skia:
> > TBR=
> >
> > Committed: https://skia.googlesource.com/skia/+/03119ba4f815bc2c2774a9349ca8278ab1695072
>
> TBR=egdaniel@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ede901c7a2e21a44552b8c1436d9521ce33f4de5
TBR=egdaniel@google.com,reed@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/836773002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gmslides.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 10b70f35b0..9350ddb29c 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -56,7 +56,7 @@ '../gm/complexclip2.cpp', '../gm/complexclip3.cpp', '../gm/composeshader.cpp', - #'../gm/conicpaths.cpp', + '../gm/conicpaths.cpp', '../gm/convexpaths.cpp', '../gm/convexpolyclip.cpp', '../gm/convexpolyeffect.cpp', |