Commit Graph
205 Commits
Author SHA1 Message Date
Jan Holesovsky bd050920ff android: Set the FONTCONFIG_FILE envvar to the fonts.conf (if exists).
Change-Id: Ic9fd97a2ff8a6d96ffcc7ad300ef30201d786528
Reviewed-on: https://gerrit.libreoffice.org/67876
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-03-11 17:46:09 +01:00
Jan Holesovsky cb6d77987c android: Separate the Android-specific setup from the actual LOK init.
Change-Id: I433376dfea0a43c63827ba15308a614f3466fb71
Reviewed-on: https://gerrit.libreoffice.org/67875
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-03-11 17:45:56 +01:00
Jan Holesovsky 35cae83fd9 android: Generate liblo-native-code.so so that it can be linked against.
And used for LibreOfficeKit directly, without a JNI wrapper.

Change-Id: If4231f53b579417b6c9c90b39541193bf2e8f27c
Reviewed-on: https://gerrit.libreoffice.org/67874
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2019-03-11 17:42:48 +01:00
Jan Holesovsky c02a78b55a android: Add a missing dependency.
Useful when you switch sdk to a different location.

Change-Id: I95301cc9adf50a0bbd918cc7562b8871093625b8
Reviewed-on: https://gerrit.libreoffice.org/67873
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-02-18 19:16:28 +01:00
Stephan Bergmann 312eeeee42 Switch Android armeabi-v7a to libc++/libc++abi/libunwind too
It had been left out in 4082a18406 "android: use
unified headers and llvm-c++ STL (x86) with NDK 16" because "arm unfortunately
crashes with llvm-c++, so keep with gnustl for now/fix that later".

Making armeabi-v7a work with libc++ etc. required a number of changes, listed
below, in this commit and in preceding ones.  At least 32-bit x86 already worked
with libc++ etc. prior to these changes in view mode, though it crashed in the
experimental editing mode (enabled with strippedUIEditing in
android/soruce/Makefile) as soon as one types in something,  But it is not
entirely clear to me why 32-bit x86 view mode didn't also fail similar to how I
saw armeabi-v7a fail.  (On 32-bit x86, these changes appear to neither improve
nor worsen the current state, view mode still appears to work fine while editing
still crashes upon typing anything.  With these changes, editing mode on
armeabi-v7a appears to work fine.  But I tested armeabi-v7a only with a real
device and 32-bit x86 only with an emulator, in case that might make a
difference.)

* Preceding <https://gerrit.libreoffice.org/#/c/64964/> "Move NSSLIBS to a more
  sensible place on the linker command line" plus this change's addition of
  -lunwind to the liblo-native-code.so linker command line make sure that
  liblo-native-code.so uses _Unwind_* functions from libunwind.a, instead of
  erroneously picking up the ones from libgcc.a that happen to be included in
  NSSLIB's nspr4 (-lgcc is automatically added to the end of the linker command
  line by the invoking compiler, that's how libgcc.a's _Unwind_* end up in
  NSSLIB's nspr4; it is neither clear to me why NSSLIB's nspr4, being a pure C
  library, uses _Unwind_* functions, nor why exception handling in
  liblo-native-code.so fails when using _Unwind_* functions from libgcc.a
  instead of from libunwind on armeabi-v7a, nor why that would work on 32-bit
  x86, but that's what I observed: ModuleManager::identify
  (framework/source/services/modulemanager.cxx) throws a
  css::lang::IllegalArgumentException, which calls __cxa_throw ->
  _Unwind_RaiseException, which ultimately lead to odd misbehavior and
  std::abort during stack unwinding when using _Unwind_RaiseException from
  libgcc.a instead of from libunwind).  (There is no libunwind.* in
  android-ndk-r16b for 32-bit x86 at least, so is presumably using _Unwind_*
  functions from libgcc.a.  It doesn't appear to make a difference if it
  indirectly uses those _Unwind_* functions from NSSLIB's nspr4, or directly
  from libgcc.a included in liblo-native-code.so if the

    $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind)

  had a ",-lgcc" else branch.)

* Preceding <https://gerrit.libreoffice.org/#/c/64965/> "Export RTTI symbols
  from liblo-native-code.so, for binary UNO bridge" makes sure that excpetions
  thrown from the binary UNO bridge can be caught by compiled catch clauses.
  Not sure why the corresponding state of
  bridges/source/cpp_uno/gcc3_linux_intel shouldn't have run into the same
  issue.

* Preceding <https://gerrit.libreoffice.org/#/c/64966/> "Adapt gcc3_linux_arm
  __cxa_exception to NDK 18 libc++abi" makes sure that our version of
  __cxa_exception matches the version from libc++abi.  This is clearly not
  relevant for 32-bit x86.  (The comment there android-ndk-r18b, but the
  additional member is already present in
  android-ndk-r16b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp, too.)

The remainder of this change just drops old armeabi-v7a--specific workarounds
that are no longer needed/no longer work.

Change-Id: Ief4c2d562c5032abe6c3b94ca3b3394be6fcd4d3
Reviewed-on: https://gerrit.libreoffice.org/64973
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-13 07:17:02 +01:00
Stephan Bergmann 357112d74c Export RTTI symbols from liblo-native-code.so, for binary UNO bridge
This will become important when switching armeabi-v7a to
libc++/libc++abi/libunwind (coming soon) which uses address instead of string
comparison when checking for type equality, so that exceptions thrown from the
binary UNO bridge will need to use the exact same RTTI objects as referenced
from the compiled catch clauses.

Change-Id: If8bcb39212b5f5e154aee215cb5f471fe2dc4a7b
Reviewed-on: https://gerrit.libreoffice.org/64965
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-13 07:16:29 +01:00
Stephan Bergmann e465f9ae17 Move NSSLIBS to a more sensible place on the linker command line
511ae02c64 "Android: Enable HAVE_FEATURE_NSS and
package the NSS libraries with apk" had added them to WHOLELIBS probably just
because that already had the $(addprefix -l,...), even though --whole-archive
doesn't make any sense for shared libraries.  Better place them later on the
linker command line (after all our own archives and compiler support libraries),
so that switching armeabi-v7a to libc++/libc++abi/libunwind (coming soon) will
be able to override erroneously picking _Unwind_* symbols from NSSLIBS's nspr4
instead of libunwind.

Change-Id: Ie0c0b7a55da3eabe1bb427232d698b2a4af63e78
Reviewed-on: https://gerrit.libreoffice.org/64964
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-13 07:16:21 +01:00
dennisroczek e39c75b05c use https links for api.libreoffice.org and opengrok
Change-Id: I74dd0142562cb8698f19b2715fa1d514f82bd749
Reviewed-on: https://gerrit.libreoffice.org/52262
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-04-02 22:25:53 +02:00
Mert Tümer fc88892e99 .uno:Save callback for the Android Viewer
Change-Id: Ic2e16985e52869092faa2a31a59a85cb77b8e28c
Signed-off-by: Mert Tümer <merttumer7@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/51506
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-27 16:25:46 +02:00
Mert Tümer e5bc7fa4e8 tdf#96796 - Added clipboard actions for the Android Viewer
Change-Id: I52e134532ab70e765b6ccd929f189be84f9c9a90
Signed-off-by: Mert Tümer <merttumer7@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/51286
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-15 00:28:31 +01:00
Thorsten Behrens b203e78a69 Revert "tdf#96796 - Added clipboard actions for the Android Viewer"
Breaks Android tinderbox

This reverts commit 31e939c9f4.

Change-Id: Id565c9ef8330c0b3bce2c678facb7605dcf3e356
2018-03-14 15:24:38 +01:00
Mert Tümer 31e939c9f4 tdf#96796 - Added clipboard actions for the Android Viewer
Change-Id: I2779ef9a9f68dcf08c3072ffe83b9f2450b7257e
Signed-off-by: Mert Tümer <merttumer7@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/50757
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-14 00:35:21 +01:00
Christian Lohmaier 4082a18406 android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it

arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later

Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-01-18 14:44:25 +01:00
Christian Lohmaier 2e8e0b213a android: drop workarounds for ndk-gdb support (can still run manually)
packing gdbserver into apk conflicts with extractNativeLibs="false", as
the gradle pugin compresses it (which could be disabled using
aaptOptions), but furthermore it doesn't page-align it, breaking
installation.
So instead let the user manually push the gdbserver tool to device and
remove the hardcoded values that were only there to please the ndk-gdb
scripts.
Using lldb from within Android Studio is more comfortable anyway :-)

Change-Id: I31c3af4847a479c56b3fcd6b5bed114e004bf0d2
Reviewed-on: https://gerrit.libreoffice.org/41950
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-09-07 22:03:10 +02:00
Miklos Vajna fa7e150241 android: remove a hard to address TODO
NSS upstream doesn't seem to support building static libs. The benefit
of avoiding a few lines of extra java code doesn't appear to outweigh
the cost of patching NSS to provide static libs & carry on those patches
in our LO-bundled NSS.

Change-Id: I01fc0b1ff076923fec64b469529d1b920c1d91c2
2017-09-01 11:18:50 +02:00
Christian Lohmaier 0aad6244eb need to manuall load all native-libs on e.g. Jellybean
511ae02c64 introduced additional libraries
that are not merged to the single liblo-native-code.so
These need to be manually loaded in correct order. See
https://stackoverflow.com/questions/11058898/loading-shared-libs-that-depend-on-other-shared-libs
for details.

Change-Id: I34b279b69de8a0f8f58f8f980e5b3a7347cd0439
2017-08-31 18:29:07 +02:00
Ximeng Zu 43f5161991 [Android Viewer] Password support
Added password support for documents.

Change-Id: Ifd9cf86894ddaf2fd5ad97510d2ac1b5850611ad
Reviewed-on: https://gerrit.libreoffice.org/40458
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2017-08-27 20:12:52 +02:00
Gautam Prajapati 511ae02c64 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>
2017-08-23 17:50:55 +02:00
Ximeng Zu 063db6b5a0 [Android Viewer] Correct LOK Enums
Corrected LOKit Enum names in Document.java.

Change-Id: I890bca0712a650b2454807fa11f43f7db14aad6b
Reviewed-on: https://gerrit.libreoffice.org/39831
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2017-07-23 23:03:38 +02:00
Ximeng Zu c746468607 Add LOKit Enums to Document.java
Added LOKit callback enums to Document.java.

Change-Id: I46b7b5fe0ceb40a89fd121082706acdf539ff916
Reviewed-on: https://gerrit.libreoffice.org/39375
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2017-06-28 23:44:09 +02:00
Ximeng Zu 662a1b0a52 Fix typo: inticator -> indicator
The related code is not being used now...
So, it's safe to just correct it before it is put
to use.

Change-Id: I1ba5f1d6d511c965c0ce08dd08bfcabc567da2c3
Reviewed-on: https://gerrit.libreoffice.org/36103
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-04-05 07:14:23 +00:00
brainbreaker 1503769fe1 tdf#106325 - No way to create a new Document
This commit will add the ability to create a new document.
A FAB is used in home screen which on expansion gives
four options namely new writer document, new impress,
new Sheet or new Draw. Two new events loadNewDocument
and saveDocumentAs have been added.
Another major change includes the use of constraint layout
in LOUIActivity layout as it decreases nesting of views and
improves the app performance. This was needed because
of the new FAB layouts being added.
Support for vector drawables has been enabled.

Change-Id: Ia3ea17f73c0d8514f8ddb7b9a1cbd2ce7de6ac08
Reviewed-on: https://gerrit.libreoffice.org/35183
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-03-30 19:59:10 +00:00
Mert Tumer 088fb93a7b tdf#106369 added toggle status ability for the list buttons
Change-Id: Ic3132441bac57abf36e3588e6871c5b14a47c25d
Reviewed-on: https://gerrit.libreoffice.org/35427
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2017-03-19 21:45:20 +00:00
aleksandar-stefanovic 11e443bfe1 Removed unnecessary imports
Import redundancy reported by Android Studio.

Change-Id: If46a43bb18268877d41d4957094acc543c4588fd
Reviewed-on: https://gerrit.libreoffice.org/32496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
2017-01-11 06:53:14 +00:00
Christian Lohmaier f6a74ce9bb no need for IPC on Android, removes the need for the cache-hack
removing the cache on each launch prevented opening files via intents
(i.e. from your mail application) unless the viewer was already running,
as it also deleted the temporary file that was created from the intent.

Change-Id: I0a4d9432f475e8434902ae11fc2b0c35fd25a71f
2016-03-23 15:50:17 +01:00
Peter Foley 2879dceaf5 improve android build status reporting
Change-Id: I29f404dc5aee27b592eac7585c5142b91060fe5c
Reviewed-on: https://gerrit.libreoffice.org/21589
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-21 07:26:38 +00:00
Mihai Varga 96cd2abd74 LOK: setClientZoom() - sets the client zoom level
We need to know the client's view level to correctly handle the mouse
events in calc. PaintTile() set a zoom level that corresponds to the
requested tiles and previously postMouseEvent would call SetZoom(1,1).
Now we can make use of knowing the client's view level and call
SetZoom() with the correct parameters

Change-Id: I34b5afcdcc06a671a8ac92c03e87404e42adf4cd

Conflicts:
	sc/source/ui/unoobj/docuno.cxx
2015-11-13 09:55:19 +02:00
Tomaž Vajngerl 6d9124de6f android: update JNI facade, rename mouse/keyboard event flags
Change-Id: Ia2b9a812717d05c7d98d47bf0fe5fd293029d045
2015-11-01 22:59:04 +01:00
Tomaž Vajngerl f70254caf4 android: remove CommandLine.java as we don't use it anymore
Change-Id: Ib487d4f948dde2027bebc914bb3fe43b55c6d50b
2015-11-01 22:59:03 +01:00
Tomaž Vajngerl c8dcec9247 android: remove the native DirectBufferAllocator
Change-Id: I41d25d288253f1b35c268ba70b8384812fa567e5
2015-10-21 15:17:10 +02:00
Christian Lohmaier 8840a66fac allow using Android Studio with lldb to debug native part
and of course also for the Java part

Using build-id linker flag allows lldb to map the installed .so to the
non-stripped version on the buildhost.

Also ndk-gdb supports specifying a different package name on the
commandline, so no need for the error in configure anymore.

Change-Id: If6887a27cc8ab15ee6ab612502cacf0a22ade737
2015-10-14 21:24:52 +02:00
Christian Lohmaier 143fb0a4b5 move extracting assets to Java & use AssetManager to access assets
using AssetsManager in both java as well as native parts allows to
handle files both with and without compression transparently

Change-Id: If02f1159c498be7ea965fd9c217410722f2dca1f
2015-10-11 02:03:43 +02:00
Christian Lohmaier ee8257a1c7 migrate android build to gradle
move preparation tasks (creating assets/processing files) from the
makefile into the gradle script

This allows much easier integration into android-studio (just open
android/source with android studio after running make to compile the
native library)

Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
2015-10-11 02:03:13 +02:00
Christian Lohmaier 1a6ec13d08 tdf#93281 clean cache directory on each start
to avoid segfault in native lib.

It's only a workaround, but I couldn't see what's wrong with the
cache...

Change-Id: Iceeee1e190bbbd6efe336d84ddcbd8c4d3a1c621
2015-10-03 22:54:39 +02:00
Christian Lohmaier de376cb1c4 android: remove no longer used files
Change-Id: Id3b71ac50e3c8ce9705f6df18edaaaa6ba8ad3fd
2015-10-03 22:54:37 +02:00
Miklos Vajna 4475c17da5 android: fix make install and don't use ant -quiet by default
Unlike 'make -s', 'ant -quiet' will stay silent even if there was an
error.

Change-Id: Iba921d3cde48875f7a6da4c5ba811cab46dfb89f
2015-10-01 16:58:08 +02:00
Tor Lillqvist 827e78fcb2 Revert "revert back to android-21 target until tinderbox gets updated"
Now it has been updated.

This reverts commit 4e47ed7e5a.
2015-09-28 14:45:09 +03:00
Christian Lohmaier 4e47ed7e5a revert back to android-21 target until tinderbox gets updated
Change-Id: Ief38ef9cc4f167caef8d991c9543161997682418
2015-09-25 16:46:28 +02:00
Christian Lohmaier 45c27ffcfd android.util.FloatMath is deprecated/was removed in ver 23
replace with corresponding Math functions and bump android sdk target to
23 to be able to use current appcompat-v7

pre-JIT FloatMath was faster, but since then was wrapper to Math anyway
http://developer.android.com/reference/android/util/FloatMath.html

Change-Id: I19e316fb7d32e616162a70fca8c565fa320a8c1a
2015-09-24 22:47:59 +02:00
Norbert Thiebaud a8db357874 gbuild/config stop using VERBOSE, use only verbose=t
configure.ac was setting VERBOSE=YES/NO when really
we use verbose=t or verbose=

Change-Id: I47aee8d177cb2d788a62ecdbbb9cc3695c2bb299
Reviewed-on: https://gerrit.libreoffice.org/17634
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-08-11 04:34:45 +00:00
Andrea Gelmini ffa8892c5a Fix typos
Change-Id: I75b4ad61785bf0ba1cb07735d938c0977356b8cc
Reviewed-on: https://gerrit.libreoffice.org/16705
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
2015-07-04 10:23:17 +00:00
Tor Lillqvist ab8cbb6cc1 Let's simplify the paths and be less 'experimental' 2015-05-21 17:10:19 +01:00
Tor Lillqvist 72a688db73 Remove more obsolete Android code: The 'AppSupport' stuff 2015-05-21 14:51:59 +01:00
Jan Holesovsky fe731a2f9f android: Plain .component files are not used from what I know.
Change-Id: I6e70dd44430a7b0e61c7618e3f0da42deadcd43d
2015-05-03 19:10:52 +02:00
Siqi Liu cc54da2237 java part handles received statechange callback 2015-04-13 16:22:49 +02:00
Tor Lillqvist 3d177c7b6d Bootstrap.initVCL is not used by our Android app any more
Change-Id: Id1e58547cf2b0786d7a2ca29eae8bbcdd644fdd5
2015-03-30 16:01:38 +03:00
Jack Leigh e41e571072 android: Bump to android-21
Change-Id: Ifbe9a316795fc0519119aa9420152118f3926653
Reviewed-on: https://gerrit.libreoffice.org/14946
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2015-03-30 09:23:46 +02:00
Tor Lillqvist 4cc1bcbaed Kill dead <touch/touch.h> API
Has all been obsoleted by LibreOfficeKit.

Only some MOBILE_* constant #defines are now left in touch.h, but probably
those are used only by dead code.

Change-Id: I646945c4408b4e6cd5510da535cfc12088dd391c
2015-03-24 15:30:27 +02:00
Miklos Vajna b0cb454f4a android: add debugrun Makefile target
Also, if we are at it:

- clean up 'run' as well: since the doc browser is the default activity,
  no need to pass the test doc path anymore
- make 'install' not depend on build: a full build would need a toplevel
  'make' anyway

Change-Id: Ia55d52f767ab3e0be02a753a95b2aac02f8491cc
2015-03-23 09:19:05 +01:00
Jan Holesovsky 5df6cd16a2 android: Make the Bold button actually work - switches to typing in bold.
Change-Id: I48da0f3cc918bda1cdb396b4ea72a82eddafb9a8
2015-03-16 09:38:10 +01:00