Include SkTypes so that SK_SUPPORT_GPU is meaningful.

For the Android framework build, we get our defines from
SkUserConfig, rather than from the makefile, so we need to
include it (via SkTypes) before we can use our defines.

Fixes Android framework build.

Review URL: https://codereview.chromium.org/700893002

1 files changed, 8 insertions, 5 deletions

diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp
index 329271a6b7..fe41243d6b 100644
--- a/src/core/SkMultiPictureDraw.cpp
+++ b/src/core/SkMultiPictureDraw.cpp
@@ -5,16 +5,19 @@
  * found in the LICENSE file.
  */
 
-#if SK_SUPPORT_GPU
-#include "GrLayerHoister.h"
-#include "GrRecordReplaceDraw.h"
-#endif
-
+// Need to include something before #if SK_SUPPORT_GPU so that the Android
+// framework build, which gets its defines from SkTypes rather than a makefile,
+// has the definition before checking it.
 #include "SkCanvas.h"
 #include "SkMultiPictureDraw.h"
 #include "SkPicture.h"
 #include "SkTaskGroup.h"
 
+#if SK_SUPPORT_GPU
+#include "GrLayerHoister.h"
+#include "GrRecordReplaceDraw.h"
+#endif
+
 void SkMultiPictureDraw::DrawData::draw() {
     fCanvas->drawPicture(fPicture, &fMatrix, fPaint);
 }