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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/test/java_uno/acquire/makefile.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/equals/makefile.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/makefile.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk index def12dd53c49..bdcf6d105178 100644 --- a/bridges/test/java_uno/acquire/makefile.mk +++ b/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 diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index 9ac266f80ff5..1da99e46131c 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/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 diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index d4926e07307b..6e481b136b0f 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/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 |