freetype: use libraries from WORKDIR

Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1

RepositoryExternal.mk

@@ -1081,6 +1081,7 @@ gb_ExternalProject__use_freetype :=
 else ifeq ($(OS),ANDROID)
 
 define gb_LinkTarget__use_freetype_headers
+$(call gb_LinkTarget_use_external_project,$(1),freetype)
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,freetype)/include \
 	$$(INCLUDE) \
@@ -1094,7 +1095,7 @@ $(call gb_LinkTarget_use_external,$(1),freetype_headers)
 endef
 
 define gb_ExternalProject__use_freetype
-$(call gb_ExternalProject_use_package,$(1),freetype)
+$(call gb_ExternalProject_use_external_project,$(1),freetype)
 
 endef
 

android/Bootstrap/Makefile.shared

@@ -90,6 +90,7 @@ LIBS = \
   $(MYTHES_LIBS) \
   $(wildcard $(WORKDIR)/UnpackedTarball/curl/lib/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a) \
+  $(wildcard $(WORKDIR)/UnpackedTarball/freetype/objs/.libs/libfreetype.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/icu/source/lib/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/lcms2/src/.libs/*.a) \
   $(wildcard $(WORKDIR)/UnpackedTarball/libcdr/src/lib/.libs/*.a) \

external/fontconfig/ExternalProject_fontconfig.mk

@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
 			--with-arch=arm \
 			--with-expat-includes=$(call gb_UnpackedTarball_get_dir,expat)/lib \
 			--with-expat-lib=$(gb_StaticLibrary_WORKDIR) \
-			--with-freetype-config=$(OUTDIR)/bin/freetype-config \
+			--with-freetype-config=$(call gb_UnpackedTarball_get_dir,freetype)/builds/unix/freetype-config \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 		&& $(MAKE) \
 	)

external/freetype/ExternalPackage_freetype.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,freetype,freetype))
-
-$(eval $(call gb_ExternalPackage_use_external_project,freetype,freetype))
-
-$(eval $(call gb_ExternalPackage_add_files,freetype,lib,\
-	objs/.libs/libfreetype.a \
-))
-
-$(eval $(call gb_ExternalPackage_add_files,freetype,bin,\
-	builds/unix/freetype-config \
-))
-
-# vim: set noet sw=4 ts=4:

external/freetype/Module_freetype.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,freetype))
 ifeq ($(OS),ANDROID)
 
 $(eval $(call gb_Module_add_targets,freetype,\
-	ExternalPackage_freetype \
 	ExternalProject_freetype \
 	UnpackedTarball_freetype \
 ))