Update the name of the friended android class and add the appropriate guards.

include/core/SkPictureRecorder.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureRecorder_DEFINED
 #define SkPictureRecorder_DEFINED
 
 #include "SkBBHFactory.h"
 #include "SkPicture.h"
 #include "SkRefCnt.h"
 
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
+namespace android {
+    class Picture;
+};
+#endif
+
 class SkCanvas;
 class SkPictureRecord;
 class SkRecord;
 class SkRecorder;
 
 class SK_API SkPictureRecorder : SkNoncopyable {
 public:
     SkPictureRecorder() : fPictureRecord(NULL), fRecorder(NULL), fRecord(NULL) { }
     ~SkPictureRecorder();
 
@@ skipping 33 matching lines @@
         after 'beginRecording'.
     */
     void internalOnly_EnableOpts(bool enableOpts);
 
 private:
     void reset();
 
     /** Replay the current (partially recorded) operation stream into
         canvas. This call doesn't close the current recording.
     */
-    friend class AndroidPicture;
+#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK

[robertphillips, 2014/06/23 15:21:15]

Can we get rid of AndroidPicture now?

+    friend class AndroidPicture; // This is temporary until we remove this from the framework
+    friend class android::Picture;
+#endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 
     int                     fWidth;
     int                     fHeight;
 
     // Both ref counted.  One of these two will be non-null:
     SkPictureRecord*        fPictureRecord;   // beginRecording()
     SkRecorder*             fRecorder;        // EXPERIMENTAL_beginRecording()
 
     // Not refcounted.  Used by EXPERIMENTAL_beginRecording().
     SkRecord* fRecord;
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif