Update woff2 to cbea7b9

third_party/woff2/Makefile

 OS := $(shell uname)
 
-CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src
+CPPFLAGS = -I./brotli/include/ -I./src
 
+AR ?= ar
 CC ?= gcc
 CXX ?= g++
 
-COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes -DFONT_COMPRESSION_BIN -D __STDC_FORMAT_MACROS
+# It's helpful to be able to turn these off for fuzzing
+CANONICAL_PREFIXES ?= -no-canonical-prefixes
+NOISY_LOGGING ?= -DFONT_COMPRESSION_BIN
+COMMON_FLAGS = -fno-omit-frame-pointer $(CANONICAL_PREFIXES) $(NOISY_LOGGING) -D __STDC_FORMAT_MACROS
 
 ifeq ($(OS), Darwin)
   CPPFLAGS += -DOS_MACOSX
 else
   COMMON_FLAGS += -fno-tree-vrp
 endif
 
+ARFLAGS = crf
 CFLAGS += $(COMMON_FLAGS)
 CXXFLAGS += $(COMMON_FLAGS) -std=c++11
 
 SRCDIR = src
 
 OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
          woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \
          variable_length.o
 
 BROTLI = brotli
-ENCOBJ = $(BROTLI)/enc/*.o
-DECOBJ = $(BROTLI)/dec/*.o
+BROTLIOBJ = $(BROTLI)/bin/obj
+ENCOBJ = $(BROTLIOBJ)/enc/*.o
+DECOBJ = $(BROTLIOBJ)/dec/*.o
+COMMONOBJ = $(BROTLIOBJ)/common/*.o
 
 OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ))
 EXECUTABLES=woff2_compress woff2_decompress
-
 EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
+ARCHIVES=convert_woff2ttf_fuzzer convert_woff2ttf_fuzzer_new_entry
+ARCHIVE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(ARCHIVES))
 
 ifeq (,$(wildcard $(BROTLI)/*))
   $(error Brotli dependency not found : you must initialize the Git submodule)
 endif
 
-all : $(OBJS) $(EXECUTABLES)
+all : $(OBJS) $(EXECUTABLES) $(ARCHIVES)
+
+$(ARCHIVES) : $(ARCHIVE_OBJS) $(OBJS) deps
+        $(AR) $(ARFLAGS) $(SRCDIR)/$@.a $(OBJS) \
+              $(COMMONOBJ) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o
 
 $(EXECUTABLES) : $(EXE_OBJS) deps
-        $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
+        $(CXX) $(LFLAGS) $(OBJS) $(COMMONOBJ) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
 
 deps :
-        $(MAKE) -C $(BROTLI)/dec
-        $(MAKE) -C $(BROTLI)/enc
+        $(MAKE) -C $(BROTLI) lib
 
 clean :
         rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
-        $(MAKE) -C $(BROTLI)/dec clean
-        $(MAKE) -C $(BROTLI)/enc clean
+        $(MAKE) -C $(BROTLI) clean