summaryrefslogtreecommitdiff
path: root/stoc/util
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-11-16 22:18:23 +0200
committerTor Lillqvist <tlillqvist@suse.com>2011-11-17 15:22:59 +0200
commit469c9ac2f9da6743e2e6944895c577df490abda5 (patch)
treee888ca3b506f40969c32d6cef8812eea7702dea8 /stoc/util
parent49a6efd9d9d0c700651d90b20559f3ceeeb7c8ce (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 'stoc/util')
-rw-r--r--stoc/util/makefile.mk4
1 files changed, 2 insertions, 2 deletions
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= \