| 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() {}
 | 
| 
 |