[Android] Use harfbuzz

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct 25 17:00:19 2015 +0100| [4d2678afddc73f7f36837eecbd03fa4fbf199e8a] | committer: Jean-Baptiste Kempf

Use harfbuzz

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=4d2678afddc73f7f36837eecbd03fa4fbf199e8a
---

 compile-libvlc.sh     |    2 +-
 libvlc/jni/Android.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index b15794b..a1c5892 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -87,7 +87,7 @@ VLC_BOOTSTRAP_ARGS="\
     --disable-sidplay2 \
     --disable-samplerate \
     --disable-faad2 \
-    --disable-harfbuzz \
+    --enable-harfbuzz \
     --enable-iconv \
     --disable-aribb24 \
     --disable-aribb25 \
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index a3db0b9..8e6edf8 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -76,7 +76,7 @@ LOCAL_LDLIBS := -L$(VLC_CONTRIB)/lib \
 	-lspeex -lspeexdsp \
 	-lxml2 -lpng -lgnutls -lgcrypt -lgpg-error \
 	-lnettle -lhogweed -lgmp \
-	-lfreetype -liconv -lass -lfribidi -lopus \
+	-lharfbuzz -lfreetype -liconv -lass -lfribidi -lopus \
 	-lEGL -lGLESv2 -ljpeg \
 	-ldvdnav -ldvdread -ldvdcss \
 	-ldsm -ltasn1 \