Update OTS to revision 99a3b7f

third_party/ots/Makefile.am

Index: third_party/ots/Makefile.am
diff --git a/third_party/ots/Makefile.am b/third_party/ots/Makefile.am
index 45361117fcd0810a9be0446b3cd3b3a3c25f7510..cde62aa6698cb72e21d8feedb487daec1b0d475c 100644
--- a/third_party/ots/Makefile.am
+++ b/third_party/ots/Makefile.am
@@ -6,9 +6,11 @@ bin_PROGRAMS = \
   ot-sanitise \
   $(NULL)
 
-noinst_PROGRAMS = \
-  perf \
-  $(NULL)
+noinst_PROGRAMS = $(NULL)
+
+if HAVE_SYSTIME
+noinst_PROGRAMS += perf
+endif
 
 if HAVE_FREETYPE
 noinst_PROGRAMS += \
@@ -21,6 +23,7 @@ endif
 lib_LIBRARIES = \
   libots.a \
   libbrotli.a \
+  libwoff2.a \
   $(NULL)
 
 TESTS = \
@@ -105,8 +108,6 @@ libots_a_SOURCES = \
   src/vmtx.h \
   src/vorg.cc \
   src/vorg.h \
-  src/woff2.cc \
-  src/woff2.h \
   $(NULL)
 
 
@@ -123,12 +124,11 @@ libbrotli_a_SOURCES = \
   third_party/brotli/dec/decode.c \
   third_party/brotli/dec/decode.h \
   third_party/brotli/dec/dictionary.h \
+  third_party/brotli/dec/dictionary.c \
   third_party/brotli/dec/huffman.c \
   third_party/brotli/dec/huffman.h \
   third_party/brotli/dec/port.h \
   third_party/brotli/dec/prefix.h \
-  third_party/brotli/dec/safe_malloc.c \
-  third_party/brotli/dec/safe_malloc.h \
   third_party/brotli/dec/state.c \
   third_party/brotli/dec/state.h \
   third_party/brotli/dec/streams.c \
@@ -138,6 +138,26 @@ libbrotli_a_SOURCES = \
   $(NULL)
 
 
+libwoff2_a_SOURCES = \
+  third_party/woff2/src/buffer.h \
+  third_party/woff2/src/round.h \
+  third_party/woff2/src/store_bytes.h \
+  third_party/woff2/src/table_tags.cc \
+  third_party/woff2/src/table_tags.h \
+  third_party/woff2/src/woff2_common.cc \
+  third_party/woff2/src/woff2_common.h \
+  third_party/woff2/src/variable_length.cc \
+  third_party/woff2/src/variable_length.h \
+  third_party/woff2/src/woff2_common.h \
+  third_party/woff2/src/woff2_dec.cc \
+  third_party/woff2/src/woff2_dec.h \
+  $(NULL)
+
+libwoff2_a_CXXFLAGS = \
+  -std=c++11 \
+  $(NULL)
+
+
 ot_sanitise_SOURCES = \
   util/ot-sanitise.cc \
   util/file-stream.h \
@@ -211,6 +231,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/src \
   -I$(top_srcdir)/include \
   -I$(top_srcdir)/third_party/brotli/dec/ \
+  -I$(top_srcdir)/third_party/woff2/src \
   $(GTEST_CPPFLAGS) \
   $(NULL)
 
@@ -222,6 +243,7 @@ AM_CXXFLAGS = \
 
 LDADD = \
   libots.a \
+  libwoff2.a \
   libbrotli.a \
   -lz \
   $(CORETEXT_LIBS) \
@@ -245,6 +267,7 @@ EXTRA_DIST = \
   tests/test_unmalicious_fonts.sh \
   third_party/brotli/LICENSE \
   third_party/gtest \
+  third_party/woff2/LICENSE \
   $(NULL)