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.
This commit is contained in:
Tor Lillqvist
2011-11-16 22:18:23 +02:00
parent 49a6efd9d9
commit 469c9ac2f9
34 changed files with 44 additions and 40 deletions

View File

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

View File

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

View File

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

View File

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

2
configmgr/source/makefile.mk Executable file → Normal file
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -50,3 +50,7 @@ STDLIBCUIMT+=-llog -landroid -lgnustl_shared
STDSHLGUIMT+=-llog -landroid -lgnustl_shared STDSHLGUIMT+=-llog -landroid -lgnustl_shared
STDSHLCUIMT+=-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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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