diff options
| author |  djsollen <djsollen@google.com> | 2016-03-07 12:30:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-07 12:30:47 -0800 |
| commit | f9deeb66d0941adfade8a24fc3b8217f9473bb1d (patch) | |
| tree | 2d5d9e75507680c80c4d74c0e976d2f09e440311 /tools/android | |
| parent | 71aca549914c868d50cd51ddff3fb7a5bfe250cd (diff) | |
Update android_make to support both --gcc and --clang options.
This CL also fixes all the errors that resulted from compiling
with clang and ccache.
BUG=skia:4948
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774503004
Review URL: https://codereview.chromium.org/1774503004
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h index d8ee0ed216..68a53816c6 100644 --- a/tools/android/SkAndroidSDKCanvas.h +++ b/tools/android/SkAndroidSDKCanvas.h @@ -72,7 +72,7 @@ protected: void onDrawImage(const SkImage*, SkScalar, SkScalar, const SkPaint*) override; void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*, SrcRectConstraint) override; - void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*); + void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int count, SkXfermode::Mode, const SkRect* cull, const SkPaint*) override; |