[Libreoffice-commits] core.git: external/libxml2 solenv/gbuild

[Peter Foley]

 external/libxml2/ExternalProject_xml2.mk |    1 +
 solenv/gbuild/platform/android.mk        |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 6aaf1ec5a781b50ceda6d0d288a43dba435be2ce
Author: Peter Foley <pefoley2 at pefoley.com>
Date:   Sun Jan 17 18:13:25 2016 -0500

    LTO fixes for android
    
    Change-Id: I2d4cedac4081260c5147d8c11904d042c765e3a6
    Reviewed-on: https://gerrit.libreoffice.org/21557
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk
index f19cb52..6d4822f 100644
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,xml2,build):
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \
 			LDFLAGS="$(if $(SYSBASE),-L$(SYSBASE)/usr/lib)" \
 			CFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(if $(debug),-g)" \
+			AR_FLAGS="$(AR_FLAGS)" \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
 		&& $(MAKE) \
 	)
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index ae1a9ea..55b6c5c 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -20,6 +20,12 @@ gb_STDLIBS := \
 
 endif
 
+ifeq ($(ENABLE_LTO),TRUE)
+	gb_LTOPLUGINFLAGS := --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
+	AR_FLAGS := rcs --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
+	RANLIB := $(RANLIB) --plugin $(shell $(CC) --print-prog-name=liblto_plugin.so)
+endif
+
 # No unit testing can be run
 gb_CppunitTest_CPPTESTPRECOMMAND := :