diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-16 22:18:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-17 15:22:59 +0200 |
| commit | 469c9ac2f9da6743e2e6944895c577df490abda5 (patch) | |
| tree | e888ca3b506f40969c32d6cef8812eea7702dea8 /testtools | |
| parent | 49a6efd9d9d0c700651d90b20559f3ceeeb7c8ce (diff) | |
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.
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/cli/makefile.mk | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 6 | ||||
| -rw-r--r-- | testtools/source/performance/makefile.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk index 3e5fd43df7d4..a8c7cb3a45d2 100644 --- a/testtools/source/bridgetest/cli/makefile.mk +++ b/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 diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 31c5b7e3dff3..a798b5090614 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/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 diff --git a/testtools/source/performance/makefile.mk b/testtools/source/performance/makefile.mk index a4b179b05634..a7f2d6b71f2c 100644 --- a/testtools/source/performance/makefile.mk +++ b/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 |