Use --with-library-suffix=lo for Android to avoid clash with system ICU

RepositoryExternal.mk

@@ -384,6 +384,12 @@ endef
 
 else # !SYSTEM_ICU
 
+ifeq ($(OS),ANDROID)
+gb_ICU_suffix:=lo
+else
+gb_ICU_suffix:=
+endif
+
 # icudata and icui18n is called icudt and icuin when built with MSVC :-(
 ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
@@ -408,22 +414,22 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
 endef
 else
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icudata \
-	icui18n \
-	icule \
-	icutu \
-	icuuc \
+	icudata$(gb_ICU_suffix) \
+	icui18n$(gb_ICU_suffix) \
+	icule$(gb_ICU_suffix) \
+	icutu$(gb_ICU_suffix) \
+	icuuc$(gb_ICU_suffix) \
 ))
 
 define gb_LinkTarget__use_icudata
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icudata \
+	icudata$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icui18n
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icui18n \
+	icui18n$(gb_ICU_suffix) \
 )
 
 endef
@@ -431,19 +437,19 @@ endif
 
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icule \
+	icule$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icutu
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icutu \
+	icutu$(gb_ICU_suffix) \
 )
 
 endef
 define gb_LinkTarget__use_icuuc
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-	icuuc \
+	icuuc$(gb_ICU_suffix) \
 )
 
 endef

icu/makefile.mk

@@ -136,8 +136,12 @@ STATIC_OR_SHARED=--disable-static --enable-shared
 BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-build=$(posix_PWD)/$(INPATH_FOR_BUILD)/misc/build/icu/source
 .ENDIF
 
+.IF "$(OS)"=="ANDROID"
+LIBRARY_SUFFIX= --with-library-suffix=lo
+.ENDIF
+
 CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
-./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) '
+./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) $(LIBRARY_SUFFIX)'
 
 CONFIGURE_FLAGS=
 
@@ -159,11 +163,11 @@ OUT2LIB= \
     $(BUILD_DIR)$/lib$/libicutu.a
 .ELIF "$(OS)"=="ANDROID"
 OUT2LIB= \
-    $(BUILD_DIR)$/lib$/libicudata.so \
-    $(BUILD_DIR)$/lib$/libicuuc.so \
-    $(BUILD_DIR)$/lib$/libicui18n.so \
-    $(BUILD_DIR)$/lib$/libicule.so \
-    $(BUILD_DIR)$/lib$/libicutu.so
+    $(BUILD_DIR)$/lib$/libicudatalo.so \
+    $(BUILD_DIR)$/lib$/libicuuclo.so \
+    $(BUILD_DIR)$/lib$/libicui18nlo.so \
+    $(BUILD_DIR)$/lib$/libiculelo.so \
+    $(BUILD_DIR)$/lib$/libicutulo.so
 .ELSE
 OUT2LIB= \
     $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \

icu/prj/d.lst

@@ -31,6 +31,12 @@ mkdir: %_DEST%\inc\external\unicode
 ..\%__SRC%\lib\libicuuc.so      %_DEST%\lib\
 ..\%__SRC%\lib\libicutu.so      %_DEST%\lib\
 
+..\%__SRC%\lib\libicudatalo.so    %_DEST%\lib\
+..\%__SRC%\lib\libicui18nlo.so    %_DEST%\lib\
+..\%__SRC%\lib\libiculelo.so      %_DEST%\lib\
+..\%__SRC%\lib\libicuuclo.so      %_DEST%\lib\
+..\%__SRC%\lib\libicutulo.so      %_DEST%\lib\
+
 ..\%__SRC%\lib\libicudata.a     %_DEST%\lib\
 ..\%__SRC%\lib\libicui18n.a     %_DEST%\lib\
 ..\%__SRC%\lib\libicule.a       %_DEST%\lib\

sal/osl/android/Makefile

@@ -62,9 +62,9 @@ ndk-build:
 		  gcc3_uno \
 		  i18nisolang1gcc3 \
 		  i18nutilgcc3 \
-		  icudata \
-		  icui18n \
-		  icuuc \
+		  icudatalo \
+		  icui18nlo \
+		  icuuclo \
 		  reg \
 		  store \
 		  ucbhelper4gcc3 \

solenv/inc/libs.mk

@@ -48,12 +48,17 @@ ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
 ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
 ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
 ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
+.ELIF "$(OS)"=="ANDROID"
+ICUINLIB=-licui18nlo
+ICULELIB=-liculelo
+ICUUCLIB=-licuuclo
+ICUDATALIB=-licudatalo
+.ELSE
 ICUINLIB=-licui18n
 ICULELIB=-licule
 ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC" && "$(SYSTEM_ICU)"!="YES"
+.ENDIF
 I18NUTILLIB=-li18nutil$(COMID)
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)