Android now uses Harfbuzz-NG. No need to keep code specific to the old version of Harfbuzz around!

include/ports/SkTypeface_android.h

Index: include/ports/SkTypeface_android.h
diff --git a/include/ports/SkTypeface_android.h b/include/ports/SkTypeface_android.h
index 0996740031dc5f2e57f1c6ee8416261e430e6ac1..2e04414f5ac0d873f25d311f901e8b50450a125c 100644
--- a/include/ports/SkTypeface_android.h
+++ b/include/ports/SkTypeface_android.h
@@ -90,7 +90,6 @@ SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 #include "SkPaintOptionsAndroid.h"
-#include "../harfbuzz/src/harfbuzz-shaper.h"
 #include "../harfbuzz_ng/src/hb.h"

[reed1, 2013/12/18 19:11:36]

man do I hate paths in includes

[djsollen, 2013/12/18 19:14:01]

Agreed.  I'll try to work with android to see if I can get them to have the
Android.mk in Harfbuzz export its C header locations.

 
 /**
@@ -102,10 +101,7 @@ SkTypeface* SkGetTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origType
  *  @return          reference to the matching typeface. Caller must call
  *                   unref() when they are done.
  */
-SK_API SkTypeface* SkCreateTypefaceForScriptNG(hb_script_t script, SkTypeface::Style style,
-        SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant);
-
-SK_API SkTypeface* SkCreateTypefaceForScript(HB_Script script, SkTypeface::Style style,
+SK_API SkTypeface* SkCreateTypefaceForScript(hb_script_t script, SkTypeface::Style style,
         SkPaintOptionsAndroid::FontVariant fontVariant = SkPaintOptionsAndroid::kDefault_Variant);
 
 #endif // #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK