harfbuzz: stop delivering headers

Change-Id: I6a68b2df3a5bd4076e07729b675179e52f4f0615

RepositoryExternal.mk

@@ -1217,6 +1217,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	harfbuzz \
 ))
 define gb_LinkTarget__use_harfbuzz
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,harfbuzz)/src \
+	$$(INCLUDE) \
+)
 $(call gb_LinkTarget_use_package,$(1),\
 	harfbuzz \
 )

harfbuzz/ExternalPackage_harfbuzz.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,harfbuzz,harfbuzz))
 
-$(eval $(call gb_ExternalPackage_add_unpacked_files,harfbuzz,inc/external/harfbuzz,\
-	src/hb.h \
-	src/hb-blob.h \
-	src/hb-buffer.h \
-	src/hb-common.h \
-	src/hb-font.h \
-	src/hb-icu.h \
-	src/hb-ot.h \
-	src/hb-ot-layout.h \
-	src/hb-ot-tag.h \
-	src/hb-set.h \
-	src/hb-shape.h \
-	src/hb-shape-plan.h \
-	src/hb-unicode.h \
-	src/hb-version.h \
-))
-
 $(eval $(call gb_ExternalPackage_use_external_project,harfbuzz,harfbuzz))
 
 $(eval $(call gb_ExternalPackage_add_file,harfbuzz,lib/libharfbuzz.a,src/.libs/libharfbuzz.a))

vcl/generic/glyphs/gcach_layout.cxx

@@ -30,8 +30,8 @@
 #include <sal/alloca.h>
 #include <rtl/instance.hxx>
 
-#include <harfbuzz/hb-icu.h>
-#include <harfbuzz/hb-ot.h>
+#include <hb-icu.h>
+#include <hb-ot.h>
 
 #include <layout/LayoutEngine.h>
 #include <layout/LEFontInstance.h>