[Libreoffice-commits] core.git: external/harfbuzz

[Libreoffice Gerrit user]

 external/harfbuzz/ExternalProject_harfbuzz.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b9e681d417cd58274d4dbb9bed225ee1fe9b9f74
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Nov 13 17:44:11 2018 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Nov 13 21:12:19 2018 +0100

    android: harfbuzz refuses to compile using mmap.
    
    Not ideal not to use mmap on a small device though, but disable for now.
    
    Change-Id: Id595cbc87c93679c1ce186f91ad36a961aee4132
    Reviewed-on: https://gerrit.libreoffice.org/63342
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 36cce8b49b58..ad5c187ba4c5 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -43,6 +43,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 			--libdir=$(call gb_UnpackedTarball_get_dir,harfbuzz/src/.libs) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			CXXFLAGS=' \
+				$(if $(filter ANDROID,$(OS)),-DHB_NO_MMAP=1,) \
 				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
 				$(if $(ENABLE_OPTIMIZED), \
 					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \