summaryrefslogtreecommitdiff
path: root/solenv
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 /solenv
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 'solenv')
-rw-r--r--solenv/inc/unxandr.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 52c92da19bbb..49b481a0498d 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -50,3 +50,7 @@ STDLIBCUIMT+=-llog -landroid -lgnustl_shared
STDSHLGUIMT+=-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