From 037d78f84134de6f24ad0df2faa4d6ff0e185790 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 17 May 2017 06:16:58 -0400 Subject: [PATCH] add guard for extra includes Bug: skia: Change-Id: Id500cb6ac6c2f4a925135a8e83ed4f2a07b73661 Reviewed-on: https://skia-review.googlesource.com/17162 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkPictureRecorder.h | 6 ++++++ public.bzl | 1 + 2 files changed, 7 insertions(+) diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index 09839cb..a6efd2b 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -12,6 +12,12 @@ #include "SkPicture.h" #include "SkRefCnt.h" +#ifdef SK_SUPPORT_PICTURERECORDER_INCLUDES +// these are not strictly necessary, but can't remove them until we update clients +#include "SkRSXform.h" +#include "SkImage.h" +#endif + #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK namespace android { class Picture; diff --git a/public.bzl b/public.bzl index 1813af0..9dfd518 100644 --- a/public.bzl +++ b/public.bzl @@ -661,6 +661,7 @@ DEFINES_ALL = [ # Staging flags for API changes # Temporarily Disable analytic AA for Google3 "SK_NO_ANALYTIC_AA", + "SK_SUPPORT_PICTURERECORDER_INCLUDES", ] ################################################################################ -- 2.7.4