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
 
@@ skipping 39 matching lines @@
         existing optimizations (i.e., to actually have the pattern
         appear in an .skp we have to disable the optimization). Call right
         after 'beginRecording'.
     */
     void internalOnly_EnableOpts(bool enableOpts);
 
 private:
     /** 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
+    friend class Picture;

[reed1, 2014/06/17 18:20:12]

Is that really the name? No namespace around it? Wow.

+#endif
     friend class SkPictureRecorderReplayTester; // for unit testing
     void partialReplay(SkCanvas* canvas) const;
 
     int                     fWidth;
     int                     fHeight;
     SkPictureRecord*        fCanvas;   // ref counted
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif