From 469c9ac2f9da6743e2e6944895c577df490abda5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 16 Nov 2011 22:18:23 +0200 Subject: 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. --- stoc/source/corereflection/makefile.mk | 2 +- stoc/source/inspect/makefile.mk | 2 +- stoc/source/invocation/makefile.mk | 2 +- stoc/source/invocation_adapterfactory/makefile.mk | 2 +- stoc/source/javaloader/makefile.mk | 2 +- stoc/source/javavm/makefile.mk | 2 +- stoc/source/namingservice/makefile.mk | 2 +- stoc/source/proxy_factory/makefile.mk | 2 +- stoc/test/registry_tdprovider/makefile.mk | 2 +- stoc/test/tdmanager/makefile.mk | 2 +- stoc/util/makefile.mk | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) (limited to 'stoc') diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk index a546a8a761db..1f4b4a5694c1 100644 --- a/stoc/source/corereflection/makefile.mk +++ b/stoc/source/corereflection/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME= stoc -TARGET = reflection.uno +TARGET = $(ENFORCEDSHLPREFIX)reflection.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = corefl diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk index 60864eea2496..62bf365fc85e 100644 --- a/stoc/source/inspect/makefile.mk +++ b/stoc/source/inspect/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME= stoc -TARGET = introspection.uno +TARGET = $(ENFORCEDSHLPREFIX)introspection.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = insp diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk index 72eeea37c659..214873d2c7c3 100644 --- a/stoc/source/invocation/makefile.mk +++ b/stoc/source/invocation/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME= stoc -TARGET = invocation.uno +TARGET = $(ENFORCEDSHLPREFIX)invocation.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = inv diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk index 4c3450ac8c8d..49bbc1a76ac2 100644 --- a/stoc/source/invocation_adapterfactory/makefile.mk +++ b/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 diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk index e53b90d5e6e7..1df3b6cf00fd 100644 --- a/stoc/source/javaloader/makefile.mk +++ b/stoc/source/javaloader/makefile.mk @@ -28,7 +28,7 @@ PRJ=..$/.. PRJNAME=stoc -TARGET = javaloader.uno +TARGET = $(ENFORCEDSHLPREFIX)javaloader.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = javaloader diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk index bcd36e69681e..6c38f601cf58 100644 --- a/stoc/source/javavm/makefile.mk +++ b/stoc/source/javavm/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME=stoc -TARGET = javavm.uno +TARGET = $(ENFORCEDSHLPREFIX)javavm.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = jen diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk index cc98cdfc3571..149874cb3c82 100644 --- a/stoc/source/namingservice/makefile.mk +++ b/stoc/source/namingservice/makefile.mk @@ -27,7 +27,7 @@ PRJ=..$/.. PRJNAME= stoc -TARGET = namingservice.uno +TARGET = $(ENFORCEDSHLPREFIX)namingservice.uno ENABLE_EXCEPTIONS=TRUE COMP1TYPELIST = namingservice diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk index 23146e678f5a..0a8a92397e18 100644 --- a/stoc/source/proxy_factory/makefile.mk +++ b/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 diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk index f258963f9299..f4d5d7be984c 100644 --- a/stoc/test/registry_tdprovider/makefile.mk +++ b/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) diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk index 8f39ac552038..488378f63b0d 100644 --- a/stoc/test/tdmanager/makefile.mk +++ b/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) diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk index 32f229cc3d14..8f58e0998bb2 100644 --- a/stoc/util/makefile.mk +++ b/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= \ -- cgit