Commit Graph

77 Commits

Author SHA1 Message Date
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
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
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
827e78fcb2 Revert "revert back to android-21 target until tinderbox gets updated"
Now it has been updated.

This reverts commit 4e47ed7e5aad8bde548b4953baba13cf99b6fd9c.
2015-09-28 14:45:09 +03:00
4e47ed7e5a revert back to android-21 target until tinderbox gets updated
Change-Id: Ief38ef9cc4f167caef8d991c9543161997682418
2015-09-25 16:46:28 +02:00
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
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
ab8cbb6cc1 Let's simplify the paths and be less 'experimental' 2015-05-21 17:10:19 +01:00
fe731a2f9f android: Plain .component files are not used from what I know.
Change-Id: I6e70dd44430a7b0e61c7618e3f0da42deadcd43d
2015-05-03 19:10:52 +02:00
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
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
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
bdd8a68c7b android: make & build appcompat-v7 library, up target to v21
Previously we included the android support library v4 for some
GUI elements like GridView. This commit in addition adds the v7
appcompat library which is needed for the new Lollipop style
Toolbar and many other new GUI elements.

The appcompat v7 library is not distributed as only a jar file
but needs to be build (as it includes additional resources) and
included as a library project. So to do this the content is copied
from SDK and build with the build system. The files also include
the v4 so it doesn't need to be copied from SDK anymore.

The target had to be raised to v21 (Lollipop), however the minimum
SDK version remains unchanged.

Change-Id: I4f1a6ce69e7f6c3f9df784a6835f376a01d4dfdb
2015-03-16 09:37:58 +01:00
3d403f2af2 Related: tdf#63690 - remove rtl_logfile
This was unused since the earlier cleanup.

Change-Id: Ia56641c4242037a0ce501e43939b8dc862499f0e
2015-02-14 00:46:15 +01:00
36e701b1db android: fix missing drawingML preset shapes
Change-Id: I7a22b9bcacd26b837c00bb09743ab2e176d60746
2015-02-09 08:12:09 +01:00
a791560cb5 android: make sure the soffice.cfg directory is always available
Otherwise FSStorageFactory::createInstanceWithArguments() would throw,
resulting in a css::configuration::CorruptedConfigurationException
later, that makes LO throw up its hands in Desktop::Main() and say that
the instset is simply corrupted, there is no point in continuing
further.

Change-Id: I3a401ee77f4fbf1a42a09c5fedd7681b4f32e952
2015-01-26 10:27:44 +01:00
3928932fe3 android: 'make release-apk' now also accepts the example document.
Change-Id: I4144d0ed42a50be4fa91f377f78a20c28fda36f6
2015-01-26 10:27:44 +01:00
ae924ed3d0 android: Rename 'make sign' to 'make release-apk'.
This now also allows to specify the version number; now you want to use:

cd android/
make versionCode=<previous_version_num+1> key=<key_name> release-apk

Change-Id: I078e8dbbe671969fc3b228ac987cdb9a4a53b281
2015-01-26 10:27:43 +01:00
609367d3c9 android: Set the package name correctly.
Change-Id: Iab771f65121e477cda871a04098df306399628e7
2015-01-26 10:27:41 +01:00
6debb045a0 android: show vendor in LOAbout
Change-Id: Iddcf953718083b218d41fcb895d28adb5808a8f4
2015-01-26 10:27:36 +01:00
4f1eef278c android: show version / buildid in about dialog
Note that getPackageName() also throws NameNotFoundException, so in the
unlikely situations in case:

- package info (class containing the package version) is not found or
- the package version is not in an "a/b" form

We still just don't show anything.

Also, mark the new TextView as android:textIsSelectable, so it's
possible to copy&paste the version for bugreport purposes.

Change-Id: I63b53cca4126da17bfbda0293d7c98e8524ef41a
2015-01-12 11:06:46 +01:00
8938d3b256 Do the configuration pruning only in the DISABLE_UI case
Change-Id: If85c6a86434c0aa32d188a0f128f6b6cd613bbb5
2014-12-04 23:04:25 +01:00
0a1e1d9a1f The configuration pruning with mobile-config.py seems to work now
Change-Id: I1b1891f0d7d7b8aa407e7da346ff5f8e3cbe8657
2014-12-04 23:04:25 +01:00
ebd868076b Add (commented-out) invocation of mobile-config.py
Change-Id: I379601099bda928b9eeeaeb29030bc009e3cbbf2
2014-12-04 23:04:24 +01:00
12491e11f0 android: force create directory assets/gz.unpack/program
It can happen that this directory doesn't exist and the copy
script fails (especially on a clean install). The script has been
modified to force create this directory before trying to copy
stuff into it.

Change-Id: Iedf3caef07e6896405750aea9e8f211b1e80dc3a
2014-12-04 12:23:04 +01:00
814e405481 Fix Android build
Adapt to URE merge. (Not sure whether the app(s) still work, but at least it
now builds.)

Change-Id: I6e85fd8eaebea75c22188f4f36269dbbe55d012a
2014-12-01 20:59:11 +02:00
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
d90d47e513 version ini-file's ProductMajor/Minor are unused
...and had started to have different values in instdir (ProductMajor=450, ProductMinor=0)
vs. installation sets (ProductMajor=50, ProductMinor=)

Change-Id: I4db2c07b5f7b011218833fc355a3097eb13d0cd4
2014-11-26 10:53:12 +01:00
2fc4952bd0 Remove unused URE_LIB_DIR
(which now had a bogus value on Mac OS X anyway)

Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
2014-11-25 14:10:43 +01:00
f33d881198 android: Better default document (when the app starts with no doc to load).
Change-Id: Ie3cc30c29723133d5e320ad3848d13f06d133c78
2014-10-04 17:52:18 +02:00
2a61d1eefa android: package C* fonts as well for interop.
Change-Id: I49c6c4bf0b2ddfb403612ccad90a41e8ae525427
2014-10-04 17:48:17 +02:00
d37803223d android: copy notice & license into assets (for apk)
Change-Id: Ic2289d5ca96d06352c853d7803938a12aa204e73
2014-10-04 17:39:28 +02:00
28eec2207c android: disable packaging of un-needed UI files.
Appears to save ~10Mb of apk size.

Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071
2014-09-30 17:07:26 +01:00
d2eeb05da6 android: Correct location and name of sofficerc.
Without that, URE_BOOTSTRAP does not get set up, and we are unable to
bootstrap.

Change-Id: I7727e2a9dcbb958e006fadf6243e1ca343633f7e
2014-06-30 14:48:04 +02:00
f918192ece android: Relink liblo-native-code.so when a library changes.
This is so that calls like 'make configmgr android' produce an .apk with
updated code changes from configmgr as expected.

Change-Id: I5f576b01269cf3f559a8a6389af298a3758e7309
2014-06-30 14:48:04 +02:00
d5d480dcce android: copy-stuff rule is copy'n'pasted around, consolidate it.
Change-Id: I0a746904fa363f987e96165d8def326eb87dcf8f
2014-06-30 14:48:03 +02:00
e3d91e9148 android: Allow verbose output from the ant build.
Change-Id: I1086a7ab6bc7913c9c9f2492d07915039007e613
2014-06-30 14:48:01 +02:00
71e3756778 Need libGLESv2 now then
Change-Id: I87e91202a6005ad0bec3569b2619a5b191991502
2014-04-15 08:39:13 +03:00
c927ceb96c Switch to android-15 here, too
Change-Id: If7b66e60fcf8af97a69e20af9c77793a163c4c17
2014-03-28 12:44:57 +02:00
7efbca6642 android: Remove native-code.cxx on make clean.
Change-Id: Ib287792c754c4b3ee6c8a45749ef9ad7197df84a
2014-01-22 20:24:54 +01:00
4175118929 Bin obsolete comment
Change-Id: I21d233996d21d78f601d427e89c14f668af85bcf
2013-12-18 19:31:24 +02:00
52bcb7e80a Fix path to lo-all-static-libs
Change-Id: I431841a71d6b4dc1f7a50efbf28f827e7e50ca57
2013-12-05 16:26:05 +02:00
e6a8768233 Use lo-all-static-libs
Change-Id: Ifaf7a6f6dd61d27a89feed2f718f7a91e9da7262
2013-11-22 23:28:49 +02:00
f29a2b4288 Add EBOOK_LIBS to android build.
Change-Id: I19af7ecf0fe746e6c41c95e647141b4c0af0f6d4
Reviewed-on: https://gerrit.libreoffice.org/6673
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2013-11-14 19:47:16 +00:00
354c1a99ea Add FREEHAND_LIBS
Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42
2013-11-01 08:59:09 +02:00
555168bd6b android: fix/remove last uses of $(OUTDIR) here
Change-Id: Iba4db538fea3ab494af737c91f5fd754de0c044c
2013-10-26 08:46:23 +02:00
96c7e0f526 No libs in $(OUTDIR)/lib any more
Change-Id: If1781415f49f86fea0de5a05a38c878d3924812b
2013-10-24 23:42:13 +03:00
b242cee828 freetype: use libraries from WORKDIR
Change-Id: Ia31a6f56fd8347f6fc50677e86a414f4c5ed81b1
2013-10-24 13:10:38 +02:00
76596b3948 fontconfig: use libraries from WORKDIR
Change-Id: I4b967187bca35527a3c3d718952ae0a3ae6ebae9
2013-10-24 13:10:38 +02:00
936a1a9daf curl: use libraries from WORKDIR
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
2013-10-24 00:24:16 +02:00