Revert "build our own fontconfig and freetype under oss-fuzz"

did I break android here mysteriously

This reverts commit f2fae368.

Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488

RepositoryExternal.mk

@@ -1273,7 +1273,7 @@ endef
 
 gb_ExternalProject__use_freetype :=
 
-else
+else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_use_external_project,$(1),freetype)
@@ -1286,7 +1286,7 @@ endef
 
 define gb_LinkTarget__use_freetype
 $(call gb_LinkTarget_use_external,$(1),freetype_headers)
-$(call gb_LinkTarget_add_libs,$(1),-lfreetype)
+$(call gb_LinkTarget_add_libs,$(1),$(FREETYPE_LIBS))
 
 endef
 
@@ -1309,7 +1309,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS))
 
 endef
 
-else
+else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
@@ -1318,8 +1318,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
 )
 
-$(call gb_LinkTarget_add_libs,$(1),-lfontconfig)
-
 endef
 
 endif # SYSTEM_FONTCONFIG

configure.ac

@@ -661,14 +661,7 @@ linux-gnu*|k*bsd*-gnu*)
     build_gstreamer_0_10=yes
     test_tde=yes
     test_kde4=yes
-    if test "$enable_fuzzers" != yes; then
-        test_freetype=yes
-        test_fontconfig=yes
-    else
-        test_freetype=no
-        test_fontconfig=no
-        BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
-    fi
+    test_freetype=yes
     _os=Linux
     ;;
 

external/fontconfig/ExternalProject_fontconfig.mk

@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 		CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \
 		./configure \
 			--disable-shared \
-			$(if $(filter ANDROID,$(OS)),--with-arch=arm) \
+			--with-arch=arm \
 			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
 			--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
 			--with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/instdir/bin/freetype-config \

external/fontconfig/Module_fontconfig.mk

@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Module_Module,fontconfig))
 
+ifeq ($(OS),ANDROID)
+
 $(eval $(call gb_Module_add_targets,fontconfig,\
 	ExternalProject_fontconfig \
 	UnpackedTarball_fontconfig \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4:

external/freetype/Module_freetype.mk

@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Module_Module,freetype))
 
+ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF)))
+
 $(eval $(call gb_Module_add_targets,freetype,\
 	ExternalProject_freetype \
 	UnpackedTarball_freetype \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4: