Enforce a "lib" prefix for UNO components for Android

This commit for the old build system. (Don't bother for components not
relevant for Android.)

The Android package installer (as invoked through "adb install", from
"ant debug install") silently ignores native libraries in app packages
(.apk files) whose names don't start with "lib" and end with ".so".

The package builder (as invoked through "ant debug") in the SDK gladly
includes also thusly named native libraries in the .apk, though. Yay
for consistency.

bridges/test/java_uno/acquire/makefile.mk

@@ -40,7 +40,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SLOFILES = $(SLO)$/testacquire.obj
 
-SHL1TARGET = testacquire.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testacquire.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map

bridges/test/java_uno/equals/makefile.mk

@@ -47,7 +47,7 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SLOFILES = $(SLO)$/testequals.obj
 
-SHL1TARGET = testequals.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testequals.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map

bridges/test/java_uno/nativethreadpool/makefile.mk

@@ -45,13 +45,13 @@ ERROR -- missing platform
 DLLPRE = # no leading "lib" on .so files
 INCPRE += $(MISC)$/$(TARGET)$/inc
 
-SHL1TARGET = $(TARGET)_client.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_client.uno
 SHL1OBJS = $(SLO)$/testnativethreadpoolclient.obj
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(TARGET)_client
 
-SHL2TARGET = $(TARGET)_server.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_server.uno
 SHL2OBJS = $(SLO)$/testnativethreadpoolserver.obj
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2VERSIONMAP = version.map

configmgr/prj/d.lst

-..\%__SRC%\bin\configmgr.uno.dll %_DEST%\bin\configmgr.uno.dll
-..\%__SRC%\lib\configmgr.uno.dylib %_DEST%\lib\configmgr.uno.dylib
-..\%__SRC%\lib\configmgr.uno.so %_DEST%\lib\configmgr.uno.so
+..\%__SRC%\bin\*.uno.dll %_DEST%\bin\*.uno.dll
+..\%__SRC%\lib\*.uno.dylib %_DEST%\lib\*.uno.dylib
+..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so
 ..\%__SRC%\misc\configmgr.component %_DEST%\xml\configmgr.component

configmgr/source/makefile.mk

@@ -76,7 +76,7 @@ SHL1STDLIBS = \
     $(SALHELPERLIB) \
     $(SALLIB) \
     $(XMLREADERLIB)
-SHL1TARGET = configmgr.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)configmgr.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 

cppcanvas/source/uno/makefile.mk

@@ -44,7 +44,7 @@ CDEFS+= -DVERBOSE
 
 SLOFILES =	$(SLO)$/uno_mtfrenderer.obj
 
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CPPCANVASLIB) $(BASEGFXLIB)
 

cppuhelper/qa/propertysetmixin/makefile.mk

@@ -60,7 +60,7 @@ SHL1IMPLIB = i$(SHL1TARGET)
 SHL1RPATH = NONE
 DEF1NAME = $(SHL1TARGET)
 
-SHL2TARGET = $(TARGET).uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
 SHL2USE_EXPORTS = name
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)

io/source/TextInputStream/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = textinstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textinstream.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------

io/source/TextOutputStream/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = textoutstream.uno
+TARGET = $(ENFORCEDSHLPREFIX)textoutstream.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------

io/source/acceptor/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = acceptor.uno
+TARGET = $(ENFORCEDSHLPREFIX)acceptor.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = acceptor

io/source/connector/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = connector.uno
+TARGET = $(ENFORCEDSHLPREFIX)connector.uno
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 COMP1TYPELIST = connectr

io/source/stm/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=io
-TARGET = streams.uno
+TARGET = $(ENFORCEDSHLPREFIX)streams.uno
 
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE

pyuno/source/loader/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=../..
 
 PRJNAME=pyuno
-TARGET=pythonloader.uno
+TARGET=$(ENFORCEDSHLPREFIX)pythonloader.uno
 ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------

remotebridges/source/unourl_resolver/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=remotebridges
-TARGET = uuresolver.uno
+TARGET = $(ENFORCEDSHLPREFIX)uuresolver.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = uuresolver
 

sdext/source/pdfimport/makefile.mk

@@ -58,7 +58,7 @@ SLOFILES=\
     $(SLO)$/services.obj
 
 SHL1DLLPRE=
-SHL1TARGET=$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1LIBS=\
     $(SLB)$/pdfmisc.lib \

sdext/source/presenter/makefile.mk

@@ -99,7 +99,7 @@ SLOFILES=										\
 
 # --- Library -----------------------------------
 
-SHL1TARGET=		$(TARGET).uno
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
 
 SHL1STDLIBS=	$(CPPUHELPERLIB)	\
                 $(CPPULIB)			\

solenv/inc/unxandr.mk

@@ -50,3 +50,7 @@ STDLIBCUIMT+=-llog -landroid -lgnustl_shared
 STDSHLGUIMT+=-llog -landroid -lgnustl_shared
 STDSHLCUIMT+=-llog -landroid -lgnustl_shared
 
+# All shared libraries we build must start with "lib" because
+# otherwise the Android package installer will not unpack them from
+# the .apk into the app's lib directory
+ENFORCEDSHLPREFIX=lib

stoc/source/corereflection/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = reflection.uno
+TARGET = $(ENFORCEDSHLPREFIX)reflection.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = corefl
 

stoc/source/inspect/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = introspection.uno
+TARGET = $(ENFORCEDSHLPREFIX)introspection.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = insp
 

stoc/source/invocation/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = invocation.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocation.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = inv
 

stoc/source/invocation_adapterfactory/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = invocadapt.uno
+TARGET = $(ENFORCEDSHLPREFIX)invocadapt.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = invadp
 

stoc/source/javaloader/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = javaloader.uno
+TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = javaloader
 

stoc/source/javavm/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = javavm.uno
+TARGET = $(ENFORCEDSHLPREFIX)javavm.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = jen
 

stoc/source/namingservice/makefile.mk

@@ -27,7 +27,7 @@
 PRJ=..$/..
 
 PRJNAME=	stoc
-TARGET = namingservice.uno
+TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = namingservice
 

stoc/source/proxy_factory/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..
 
 PRJNAME=stoc
-TARGET = proxyfac.uno
+TARGET = $(ENFORCEDSHLPREFIX)proxyfac.uno
 ENABLE_EXCEPTIONS=TRUE
 COMP1TYPELIST = proxyfac
 

stoc/test/registry_tdprovider/makefile.mk

@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SLOFILES = $(SLO)$/testregistrytdprovider.obj
 
-SHL1TARGET = testregistrytdprovider.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testregistrytdprovider.uno
 SHL1OBJS = $(SLOFILES)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)

stoc/test/tdmanager/makefile.mk

@@ -38,7 +38,7 @@ DLLPRE = # no leading "lib" on .so files
 
 SLOFILES = $(SLO)$/testtdmanager.obj
 
-SHL1TARGET = testtdmanager.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)testtdmanager.uno
 SHL1OBJS = $(SLOFILES)
 SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)

stoc/util/makefile.mk

@@ -37,7 +37,7 @@ DLLPRE =
 
 # ------------------------------------------------------------------
 
-SHL1TARGET=	$(TARGET)
+SHL1TARGET=	$(ENFORCEDSHLPREFIX)$(TARGET)
 
 LIB1TARGET=	$(SLB)$/$(TARGET).lib
 LIB1FILES=	$(SLB)$/bootstrap.lib \
@@ -68,7 +68,7 @@ SHL1RPATH=  URELIB
 
 DEF1NAME=	$(SHL1TARGET)
 
-SHL2TARGET=	stocservices.uno
+SHL2TARGET=	$(ENFORCEDSHLPREFIX)stocservices.uno
 
 LIB2TARGET=	$(SLB)$/stocservices.uno.lib
 LIB2FILES=	\

testtools/source/bridgetest/cli/makefile.mk

@@ -28,7 +28,7 @@
 PRJ=..$/..$/..
 
 PRJNAME=testtools
-TARGET=cli_cpp_bridgetest.uno
+TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
 USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE
 ENABLE_EXCEPTIONS=TRUE

testtools/source/bridgetest/makefile.mk

@@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib
 LIB1OBJFILES= \
         $(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
 
-SHL1TARGET = cppobj.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno
 SHL1STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
@@ -98,7 +98,7 @@ LIB2OBJFILES= \
         $(SLO)$/currentcontextchecker.obj \
         $(SLO)$/multi.obj
 
-SHL2TARGET = bridgetest.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno
 SHL2STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
@@ -109,7 +109,7 @@ SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=	$(SHL2TARGET)
 SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 
-SHL3TARGET = constructors.uno
+SHL3TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno
 SHL3OBJS = $(SLO)$/constructors.obj
 SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL3VERSIONMAP = $(SOLARENV)/src/component.map

testtools/source/performance/makefile.mk

@@ -43,7 +43,7 @@ LIB1TARGET=$(SLB)$/perftest.lib
 LIB1OBJFILES= \
         $(SLO)$/ubtest.obj
 
-SHL1TARGET = perftest.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perftest.uno
 
 SHL1VERSIONMAP = $(SOLARENV)$/src$/component.map
 
@@ -62,7 +62,7 @@ LIB2TARGET=$(SLB)$/perfobj.lib
 LIB2OBJFILES= \
         $(SLO)$/ubobject.obj
 
-SHL2TARGET = perfobj.uno
+SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)perfobj.uno
 
 SHL2VERSIONMAP = $(SOLARENV)$/src$/component.map
 

ucb/source/ucp/expand/makefile.mk

@@ -28,7 +28,7 @@
 PRJ = ..$/..$/..
 PRJNAME = ucb
 UCPEXPAND_MAJOR = 1
-TARGET = ucpexpand$(UCPEXPAND_MAJOR).uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpexpand$(UCPEXPAND_MAJOR).uno
 ENABLE_EXCEPTIONS = TRUE
 NO_BSYMBOLIC = TRUE
 

ucb/source/ucp/ext/makefile.mk

@@ -27,7 +27,7 @@
 
 PRJ = ..$/..$/..
 PRJNAME = ucb
-TARGET = ucpext.uno
+TARGET = $(ENFORCEDSHLPREFIX)ucpext.uno
 ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE : settings.mk

ucb/source/ucp/tdoc/makefile.mk

@@ -29,7 +29,7 @@ PRJ=..$/..$/..
 PRJNAME=ucb
 # Version
 UCPTDOC_MAJOR=1
-TARGET=ucptdoc$(UCPTDOC_MAJOR).uno
+TARGET=$(ENFORCEDSHLPREFIX)ucptdoc$(UCPTDOC_MAJOR).uno
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 NO_BSYMBOLIC=TRUE