diff options
| author |  bsalomon <bsalomon@google.com> | 2014-08-13 15:18:46 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-13 15:18:46 -0700 |
| commit | c15e28a5224a3a0e977d6b2da44ce89302d01186 (patch) | |
| tree | b2013497231194668d4813a62a03983b8f2ed725 /gyp | |
| parent | 6cfa73a29a26edf1d03bca224ad6860396308ffc (diff) | |
Revert of Remove SkPaintOptionsAndroid (patchset #5 of https://codereview.chromium.org/447873003/)
Reason for revert:
Breaks the Chromium build: http://108.170.220.120:10117/builders/Canary-Chrome-Ubuntu13.10-Ninja-x86_64-DRT/builds/2469/steps/BuildContentShell_1/logs/stdio
Original issue's description:
> Remove SkPaintOptionsAndroid
>
> Committed: https://skia.googlesource.com/skia/+/f32331ffdb5de0440bb337aa7cbdd6f33e9ff23b
R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com
TBR=djsollen@google.com, mtklein@google.com, reed@google.com, tomhudson@google.com
NOTREECHECKS=true
NOTRY=true
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/473543004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/tests.gypi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index b6b0ef1ee0..8a7350e240 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -117,6 +117,7 @@ '<(skia_src_path)/core/SkMipMap.cpp', '<(skia_src_path)/core/SkPackBits.cpp', '<(skia_src_path)/core/SkPaint.cpp', + '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp', '<(skia_src_path)/core/SkPaintPriv.cpp', '<(skia_src_path)/core/SkPaintPriv.h', '<(skia_src_path)/core/SkPath.cpp', diff --git a/gyp/tests.gypi b/gyp/tests.gypi index d45c535582..358867de11 100644 --- a/gyp/tests.gypi +++ b/gyp/tests.gypi @@ -46,6 +46,7 @@ '../tests/AAClipTest.cpp', '../tests/ARGBImageEncoderTest.cpp', + '../tests/AndroidPaintTest.cpp', '../tests/AnnotationTest.cpp', '../tests/AsADashTest.cpp', '../tests/AtomicTest.cpp', |