[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/Bootstrap

[Michael Weghorn (via logerrit)]

 android/Bootstrap/Makefile.shared |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 275c54933c8a2a9efb7c8ec2cbd0fa13a8f4f0de
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Dec 16 10:46:29 2019 +0100
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Jun 10 20:17:25 2020 +0200

    android: Fix linking of liblo-native-code.so on x86_64
    
    This is similar to commit c6dadf5035c8e1c31dbd3fccec167bd4a906bf54
    ("commit android: Fix linking of liblo-native-code.so on aarch64.").
    
    Build previously failed with
    
        Linking obj/local/x86_64/liblo-native-code.so
        .../x86_64-linux-android/bin/ld.gold: error: cannot find -landroid_support
        clang++: error: linker command failed with exit code 1 (use -v to see invocation)
        make[2]: *** [../Bootstrap/Makefile.shared:62: obj/local/x86_64/liblo-native-code.so] Error 1
        make[1]: *** [.../android/CustomTarget_lo_android.mk:18: .../workdir/CustomTarget/android/source/done] Error 2
        make: *** [Makefile:282: build] Error 2
    
    I quickly checked that the app actually runs on an x86_64 AVD
    and is able to open and display documents after successfully
    building with this commit in place.
    
    Change-Id: I92b3759af6a86a6717c287d035b6a1add3a9af7a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85204
    Tested-by: Jenkins
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95601
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 8c6270226fe9..0d7f2581ee3d 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
 	@echo "Linking $@"
 	mkdir -p $(OBJLOCAL)
-	$(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
+	$(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 x86_64,$(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)