[HarfBuzz] harfbuzz: Branch 'master' - 4 commits

[Behdad Esfahbod]

 Android.mk       |   38 ++++++++++++--------------------------
 util/hb-shape.cc |    5 ++++-
 2 files changed, 16 insertions(+), 27 deletions(-)

New commits:
commit 9d4ede3a97fff544a5ec2a671e49a92a79645b61
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 9 16:19:55 2014 -0400

    [Android.mk] Update source list

diff --git a/Android.mk b/Android.mk
index 512f585..610b40a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,6 @@ HARFBUZZ_SRC_FILES = \
 	src/hb-buffer-serialize.cc \
 	src/hb-buffer.cc \
 	src/hb-common.cc \
-	src/hb-fallback-shape.cc \
 	src/hb-face.cc \
 	src/hb-font.cc \
 	src/hb-ot-tag.cc \
@@ -29,21 +28,25 @@ HARFBUZZ_SRC_FILES = \
 	src/hb-shape.cc \
 	src/hb-shape-plan.cc \
 	src/hb-shaper.cc \
-	src/hb-tt-font.cc \
 	src/hb-unicode.cc \
 	src/hb-warning.cc \
+	src/hb-ot-font.cc \
 	src/hb-ot-layout.cc \
 	src/hb-ot-map.cc \
 	src/hb-ot-shape.cc \
 	src/hb-ot-shape-complex-arabic.cc \
 	src/hb-ot-shape-complex-default.cc \
+	src/hb-ot-shape-complex-hangul.cc \
+	src/hb-ot-shape-complex-hebrew.cc \
 	src/hb-ot-shape-complex-indic.cc \
 	src/hb-ot-shape-complex-indic-table.cc \
 	src/hb-ot-shape-complex-myanmar.cc \
 	src/hb-ot-shape-complex-sea.cc \
 	src/hb-ot-shape-complex-thai.cc \
+	src/hb-ot-shape-complex-tibetan.cc \
 	src/hb-ot-shape-normalize.cc \
-	src/hb-ot-shape-fallback.cc
+	src/hb-ot-shape-fallback.cc \
+	$(NULL)
 
 #############################################################
 #   build the harfbuzz shared library
commit 7e1ab1f6d812a55f75d4844f7981d5604481049c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 9 16:13:40 2014 -0400

    [Android.mk] Whitespace

diff --git a/Android.mk b/Android.mk
index 98dfa6f..512f585 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,57 +46,43 @@ HARFBUZZ_SRC_FILES = \
 	src/hb-ot-shape-fallback.cc
 
 #############################################################
-#   build the harfbuzz library
+#   build the harfbuzz shared library
 #
-
 include $(CLEAR_VARS)
-
 LOCAL_ARM_MODE := arm
-
 LOCAL_MODULE_TAGS := optional
-
 LOCAL_SRC_FILES:= \
 	$(HARFBUZZ_SRC_FILES) \
 	src/hb-icu.cc
-
 LOCAL_CPP_EXTENSION := .cc
-
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
         libicuuc \
         libicui18n \
         libutils
-
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/src \
         external/icu4c/common
-
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_ICU
-
 LOCAL_MODULE:= libharfbuzz_ng
-
 include $(BUILD_SHARED_LIBRARY)
 
 #############################################################
 #   build the harfbuzz static library
 #
 include $(CLEAR_VARS)
-
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES:= \
 	$(HARFBUZZ_SRC_FILES) \
 	src/hb-ucdn.cc \
 	src/hb-ucdn/ucdn.c
-
-LOCAL_CPP_EXTENSION     := .cc
-LOCAL_STATIC_LIBRARIES  := libft2
-LOCAL_C_INCLUDES        := \
-  $(LOCAL_PATH)/src \
-  external/freetype/include
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_STATIC_LIBRARIES := libft2
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/src \
+	external/freetype/include
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -DHAVE_FREETYPE
-
 LOCAL_MODULE:= libharfbuzz_ng
 
 include $(BUILD_STATIC_LIBRARY)
-
commit 5c6695c42470e0a15e9029ebe8ecbebf3fa4f95b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 9 16:07:12 2014 -0400

    [Android.mk] Remove -lpthread; we build with -DHB_NO_MT

diff --git a/Android.mk b/Android.mk
index 757d136..98dfa6f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,8 +73,6 @@ LOCAL_C_INCLUDES += \
 
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_ICU
 
-LOCAL_LDLIBS += -lpthread
-
 LOCAL_MODULE:= libharfbuzz_ng
 
 include $(BUILD_SHARED_LIBRARY)
@@ -97,7 +95,6 @@ LOCAL_C_INCLUDES        := \
   $(LOCAL_PATH)/src \
   external/freetype/include
 LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -DHAVE_FREETYPE
-LOCAL_LDLIBS += -lpthread
 
 LOCAL_MODULE:= libharfbuzz_ng
 
commit 9109f1e944dd4bd4ae8057b75c8a31e9d31797aa
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jul 8 20:02:29 2014 -0400

    [util/hb-shape] Accept an empty output-format that would skip output
    
    Useful for benchmarking, to avoid buffer serialization overhead (which
    seems to by far dominate shaping!)

diff --git a/util/hb-shape.cc b/util/hb-shape.cc
index b7d2ca6..324934a 100644
--- a/util/hb-shape.cc
+++ b/util/hb-shape.cc
@@ -48,7 +48,10 @@ struct output_buffer_t
       output_format = HB_BUFFER_SERIALIZE_FORMAT_TEXT;
     else
       output_format = hb_buffer_serialize_format_from_string (options.output_format, -1);
-    if (!hb_buffer_serialize_format_to_string (output_format))
+    /* An empty "output_format" parameter basically skips output generating.
+     * Useful for benchmarking. */
+    if (*options.output_format &&
+	!hb_buffer_serialize_format_to_string (output_format))
     {
       if (options.explicit_output_format)
 	fail (false, "Unknown output format `%s'; supported formats are: %s",