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

Miklos Vajna vmiklos at collabora.co.uk
Sun Apr 12 09:37:45 PDT 2015


 external/icu/UnpackedTarball_icu.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db2d64f5a2d1f4d4a4b419db618d648ceb339a34
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Apr 12 18:37:02 2015 +0200

    icu: fix Android build
    
    Change-Id: I15f8e960f253db3f13f68bb2da84f0191d888f5b

diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 774eb10..0934289 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/icu.changeset_36724.patch.1 \
 	external/icu/icu.changeset_36727.patch.1 \
 	external/icu/icu.changeset_36801.patch.1 \
-	external/icu/icu4c-icudata-stdlibs.diff \
+	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
 ))
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list