Don't create an icudata library for iOS

The intent being that the data file will be used instead.

To avoid linking error, correspondingly include the ICU stubdata
library in the list of static libraries to link with.

Change-Id: I0f223fcce89dfbe283aaa2fcd2d5a58ea36ba364

bin/lo-all-static-libs

@@ -34,17 +34,24 @@ for var in EBOOK_LIBS FREEHAND_LIBS HARFBUZZ_LIBS HUNSPELL_LIBS HYPHEN_LIB MYTHE
     done
 done
 
-androidlibs=
-if test "$OS" = ANDROID; then
-    androidlibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a"
-    androidlibs="$androidlibs $WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a"
-    androidlibs="$androidlibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a"
-fi
+case $OS in
+ANDROID)
+    oslibs="$WORKDIR/UnpackedTarball/curl/lib/.libs/*.a"
+    oslibs="$oslibs $WORKDIR/UnpackedTarball/fontconfig/src/.libs/libfontconfig.a"
+    oslibs="$oslibs $WORKDIR/UnpackedTarball/freetype/objs/.libs/libfreetype.a"
+    ;;
+IOS)
+    oslibs="$WORKDIR/UnpackedTarball/icu/source/stubdata/*.a"
+    ;;
+*)
+    oslibs=
+    ;;
+esac
 
 echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
      $foolibs \
      $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
-     $androidlibs \
+     $oslibs \
      $WORKDIR/UnpackedTarball/glew/lib/*.a \
      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \

external/icu/ExternalProject_icu.mk

@@ -84,7 +84,9 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				--enable-static --disable-shared,\
 				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
-				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source)\
+				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
+			$(if $(filter IOS,$(OS)), \
+				--with-data-packaging=archive) \
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \