prepare skia for shared library build on android

include/pdf/SkPDFDocument.h

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFDocument_DEFINED
 #define SkPDFDocument_DEFINED
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
 #include "SkTScopedPtr.h"
 
 class SkPDFCatalog;
 class SkPDFDevice;
 class SkPDFDict;
 class SkPDFPage;
 class SkPDFObject;
 class SkWStream;
+#ifndef SkTSet_DEFINED
 template <typename T> class SK_API SkTSet;
-
+#endif

[djsollen, 2013/05/30 20:35:29]

remove

[Zach Reizner, 2013/05/31 13:16:38]

Turns out this is needed to prevent the following error:
type attributes ignored after type is already defined [-Werror=attributes]

 /** \class SkPDFDocument
 
     A SkPDFDocument assembles pages together and generates the final PDF file.
 */
 class SkPDFDocument {
 public:
     enum Flags {
         kNoCompression_Flags = 0x01,  //!< DEPRECATED.
         kFavorSpeedOverSize_Flags = 0x01,  //!< Don't compress the stream, but
                                            // if it is already compressed return
@@ skipping 60 matching lines @@
     size_t headerSize();
 
     /** Output the PDF footer to the passed stream.
      *  @param stream    The writable output stream to send the footer to.
      *  @param objCount  The number of objects in the PDF.
      */
     void emitFooter(SkWStream* stream, int64_t objCount);
 };
 
 #endif