diff options
| author | Gautam Prajapati <gautamprajapati06@gmail.com> | 2017-08-18 23:17:15 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-08-23 17:50:55 +0200 |
| commit | 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 (patch) | |
| tree | b55634866b626b9c8258a902fa78f5ee901eb900 /android | |
| parent | f8fa4631f35799f1afeec2ecba7eec5bbdba95e5 (diff) | |
Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk
This commit enables HAVE_FEATURE_NSS for Android and fixes the svl/ vcl/
and xmlsecurity/ module to use NSS.
xmlsecurity/ wasn't built for Android previously, this commit enables
building xmlsecurity/ for Android and disables the support of gpgme
in the same module(Only for Android).
It also enables the linking of NSS shared libraries with
liblo-native-code.so and adds a rule to package them along with the apk.
Change-Id: I7d0341688ac979ae92e9145c37dd107670417fe1
Reviewed-on: https://gerrit.libreoffice.org/41308
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e26530595cad..e06e36cdac54 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -35,10 +35,24 @@ LIBS = \ $(ALL_STATIC_LIBS) \ -Wl,--end-group +NSSLIBS = freebl3 \ + nspr4 \ + nss3 \ + nssckbi \ + nssdbm3 \ + nssutil3 \ + plc4 \ + plds4 \ + smime3 \ + softokn3 \ + sqlite3 \ + ssl3 \ + WHOLELIBS = \ -Wl,--whole-archive \ $(addprefix -l,$(strip \ juh \ + $(NSSLIBS) \ )) \ -Wl,--no-whole-archive @@ -53,7 +67,11 @@ $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so #to keep some symbols, eg.: $(STRIP) -o $(SODEST)/liblo-native-code.so $(OBJLOCAL)/liblo-native-code.so -w -K 'Java*' -link-so: $(SODEST)/liblo-native-code.so +$(SODEST)/nss-libraries : + mkdir -p $(SODEST) + $(foreach lib,$(NSSLIBS),$(STRIP) -o $(SODEST)/lib$(lib).so $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib$(lib).so;) + +link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries # If you reinstall an app several times *on the emulator*, even if you # uninstall it between, disk space seems to leak that won't get recycled until |