API modifications needed to upstream Android font changes.

include/ports/SkTypeface_android.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkTypeface_android_DEFINED
 #define SkTypeface_android_DEFINED
 
+#ifdef SK_BUILD_FOR_ANDROID
+
 #include "SkTypeface.h"
 
 /**
  *  Get the family name of the font in the fallback font list containing
  *  the specified chararacter. if no font is found, returns false.
  */
 SK_API bool SkGetFallbackFamilyNameForChar(SkUnichar uni, SkString* name);
 
 /**
  *  For test only.
@@ skipping 10 matching lines @@
  *  on. This process must be finite, and when the fonthost sees a
  *  font with no logical successor, it must return NULL.
  *
  *  The original fontID is also provided. This is the initial font that was
  *  stored in the typeface of the caller. It is provided as an aid to choose
  *  the best next logical font. e.g. If the original font was bold or serif,
  *  but the 2nd in the logical chain was plain, then a subsequent call to
  *  get the 3rd can still inspect the original, and try to match its
  *  stylistic attributes.
  */
-SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID);
+SkTypeface* SkAndroidNextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
+                                         const SkPaintOptionsAndroid& options);
 
-#endif
+#endif // #ifdef SK_BUILD_FOR_ANDROID
+#endif // #ifndef SkTypeface_android_DEFINED