[Libreoffice-commits] core.git: android/Bootstrap

[Jan Holesovsky (via logerrit)]

 android/Bootstrap/Makefile.shared |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Nov 1 17:57:17 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Mon Dec 2 09:14:37 2019 +0100

    android: Fix linking of liblo-native-code.so on aarch64.
    
    Forces gold as the linker; but according to the switches that were used,
    I suppose gold was used previously anyway, so hopefully not really a
    problem.
    
    Change-Id: I7bc54abf0d3b4b3d86d53e4ea6f01146cf196216
    Reviewed-on: https://gerrit.libreoffice.org/81905
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit fa145a035fbab652ec8f3ee870e44e43dd1d770a)
    Reviewed-on: https://gerrit.libreoffice.org/81915

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 7126e9a2f506..00ad02285cf1 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -51,7 +51,7 @@ NSSLIBS = freebl3 \
 WHOLELIBS = \
   -Wl,--whole-archive \
   $(addprefix -l,$(strip \
-	juh \
+	$(if $(ENABLE_JAVA),juh) \
   )) \
   -Wl,--no-whole-archive
 
@@ -59,7 +59,7 @@ WHOLELIBS = \
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
 	@echo "Linking $@"
 	mkdir -p $(OBJLOCAL)
-	$(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi -landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+	$(CXX) -fuse-ld=gold -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi $(if $(filter-out arm64-v8a,$(ANDROID_APP_ABI)),-landroid_support) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
 	mkdir -p $(SODEST)