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 /ucb | |
| 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 'ucb')
| -rw-r--r-- | ucb/source/ucp/expand/makefile.mk | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/makefile.mk | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/tdoc/makefile.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk index 70e441171a44..9182517da731 100644 --- a/ucb/source/ucp/expand/makefile.mk +++ b/ucb/source/ucp/expand/makefile.mk @@ -28,7 +28,7 @@ PRJ = ..$/..$/.. PRJNAME = ucb UCPEXPAND_MAJOR = 1 -TARGET = ucpexpand$(UCPEXPAND_MAJOR).uno +TARGET = $(ENFORCEDSHLPREFIX)ucpexpand$(UCPEXPAND_MAJOR).uno ENABLE_EXCEPTIONS = TRUE NO_BSYMBOLIC = TRUE diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk index b5f2734a6986..b9e9a11d3fd4 100644 --- a/ucb/source/ucp/ext/makefile.mk +++ b/ucb/source/ucp/ext/makefile.mk @@ -27,7 +27,7 @@ PRJ = ..$/..$/.. PRJNAME = ucb -TARGET = ucpext.uno +TARGET = $(ENFORCEDSHLPREFIX)ucpext.uno ENABLE_EXCEPTIONS = TRUE .INCLUDE : settings.mk diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk index 82c76b34b206..611a26962385 100644 --- a/ucb/source/ucp/tdoc/makefile.mk +++ b/ucb/source/ucp/tdoc/makefile.mk @@ -29,7 +29,7 @@ PRJ=..$/..$/.. PRJNAME=ucb # Version UCPTDOC_MAJOR=1 -TARGET=ucptdoc$(UCPTDOC_MAJOR).uno +TARGET=$(ENFORCEDSHLPREFIX)ucptdoc$(UCPTDOC_MAJOR).uno ENABLE_EXCEPTIONS=TRUE USE_DEFFILE=TRUE NO_BSYMBOLIC=TRUE |