Build lcms2 statically for Android, too.

A quick way to avoid the problem with its name ending with ".so.2"
which the Android app machinery doesn't like. Plus, one less shared
library...

Change-Id: I102e29dd13d1be1a134be8c09459259fe8fbe2e1

RepositoryExternal.mk

@@ -945,6 +945,21 @@ endef
 
 else # !SYSTEM_LCMS2
 
+ifeq ($(OS),ANDROID)
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	lcms2 \
+))
+
+define gb_LinkTarget__use_lcms2
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+	lcms2 \
+)
+
+endef
+
+else
+
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	lcms2 \
 ))
@@ -956,6 +971,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 
 endef
 
+endif # ANDROID
 endif # SYSTEM_LCMS2
 
 

lcms2/makefile.mk

@@ -77,7 +77,7 @@ CONFIGURE_FLAGS += \
     --prefix=/@.__________________________________________________$(EXTRPATH)
 .END
 
-.IF "$(OS)" == "IOS"
+.IF "$(OS)" == "IOS" || "$(OS)" == "ANDROID" 
 CONFIGURE_ACTION += --disable-shared
 .ENDIF
 
@@ -89,7 +89,7 @@ OUT2INC+=include$/lcms2*.h
 
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=src$/.libs$/liblcms2.*.dylib
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" 
 OUT2LIB+=src$/.libs$/liblcms2.a
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"