Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: src/core/SkPictureRecorder.cpp

Issue 693613005: Fix Android framework build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPictureRecorder.cpp
diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp
index 2985b2dfff4facbc1a77eba13ab3b19b484e2ba8..160446797dc8ba00b75cc989a831343fa71dfa36 100644
--- a/src/core/SkPictureRecorder.cpp
+++ b/src/core/SkPictureRecorder.cpp
@@ -5,10 +5,6 @@
* found in the LICENSE file.
*/
-#if SK_SUPPORT_GPU
-#include "GrPictureUtils.h"
-#endif
-
#include "SkPictureRecorder.h"
#include "SkRecord.h"
#include "SkRecordDraw.h"
@@ -16,6 +12,12 @@
#include "SkRecordOpts.h"
#include "SkTypes.h"
+// Must place SK_SUPPORT_GPU after other includes so it is defined in the
+// Android framework build.
+#if SK_SUPPORT_GPU
+#include "GrPictureUtils.h"
+#endif
+
SkPictureRecorder::SkPictureRecorder() {}
SkPictureRecorder::~SkPictureRecorder() {}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698