[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/Makefile.sources |    1 +
 src/hb-subset.cc     |    5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit cc0b04f48f261c1deb8f4142e7ae0222fbec67fb
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jun 12 18:24:54 2018 -0400

    [subset] Remove HB_SUBSET_BUILTIN
    
    Just include hb-static.cc in libharfbuzz-subset.so source list as
    well.  Those building it built-in will include hb-static.cc once
    already.  No need for any gymnastics.

diff --git a/src/Makefile.sources b/src/Makefile.sources
index 299af983..0bc9e589 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -203,6 +203,7 @@ HB_ICU_headers = hb-icu.h
 
 # Sources for libharfbuzz-subset
 HB_SUBSET_sources = \
+	hb-static.cc \
 	hb-subset.cc \
 	hb-subset-glyf.cc \
 	hb-subset-input.cc \
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 4098832b..b97c7633 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -44,11 +44,6 @@
 #include "hb-ot-post-table.hh"
 
 
-#if !defined(HB_SUBSET_BUILTIN)
-#include "hb-static.cc"
-#endif
-
-
 struct hb_subset_profile_t {
   hb_object_header_t header;
   ASSERT_POD ();