diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-11-07 14:57:52 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2019-11-07 15:06:00 +0100 |
| commit | eb050ae015300e850553f71b4ebbd80f40f4c3f3 (patch) | |
| tree | 7e932cc7be2af524e19c1438cb19c87981894682 /android | |
| parent | 96df9f4da5542a33a5dfb1fa831212d8eda2dff0 (diff) | |
tdf#123290 fix android tinderbox builds/properly package libc++_shared.so
While it might not be the original problem, at least that is the current
problem the tinderbox provided builds have and should make it work again
Change-Id: Ifaedb3304622286cfe7a6cb49e862a359b53f892
Diffstat (limited to 'android')
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 942f5f8179ee..7126e9a2f506 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -70,7 +70,10 @@ $(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 +$(SODEST)/libc++_shared.so : $(ANDROID_NDK_HOME)/sources/cxx-stl/llvm-libc++/libs/$(ANDROID_APP_ABI)/libc++_shared.so + cp $< $@ + +link-so: $(SODEST)/liblo-native-code.so $(SODEST)/nss-libraries $(SODEST)/libc++_shared.so # 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 |