commit f9deeb66d0941adfade8a24fc3b8217f9473bb1d
author djsollen <djsollen@google.com> Mon Mar 07 12:30:47 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Mar 07 12:30:47 2016 -0800
tree 2d5d9e75507680c80c4d74c0e976d2f09e440311
parent 71aca549914c868d50cd51ddff3fb7a5bfe250cd

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

tools/android/SkAndroidSDKCanvas.h

diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h
index d8ee0ed..68a5381 100644
--- a/tools/android/SkAndroidSDKCanvas.h
+++ b/tools/android/SkAndroidSDKCanvas.h
@@ -72,7 +72,7 @@
     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;