Commit Graph
15 Commits
Author SHA1 Message Date
Ivan Vladimirovich Kuznetsov 56ef560f84 Android. Rename source module to app
According to documentation
https://developer.android.com/build/android-build-structure
the root module should be named "app".
So the source module was renamed.

Change-Id: I1d8e239ab2df54cc294aa7da0a9746a87952bb3c
2026-07-20 14:49:35 +02:00
Ivan Vladimirovich Kuznetsov 26173fcdad Android. Turn to standard android project structure.
There is no reason to use a custom project structure. The usual Android
project structure makes the development of new features easier using a
modular approach. Therefore, the logic of gradle files was divided into
different levels, gradle scripts was migrated to kotlin,
dependency definitions was moved into toml file.
No one java or kotlin file has been changed.

These changes based on:
1) Android build structure:
https://developer.android.com/build/android-build-structure
2) Migrate your build to version catalogs:
https://developer.android.com/build/migrate-to-catalogs
3) Migrate your build configuration from Groovy to Kotlin
https://developer.android.com/build/migrate-to-kotlin-dsl

Note: The source module has not been renamed to app (this is the usual
name for a top-level application subproject), because I currently do not
know what other changes will need to be made besides gradle scripts
(maybe in the Makefiles or in other) for a correct build. Additional
analysis required.

Change-Id: Ic11efdb51524e795b8c6e2605b6501d9699c525c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195939
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2026-02-17 10:10:45 +01:00
Christian Lohmaier 0c4c84a14b makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)
…by a simple/static $(gb_CustomTarget_workdir)/foo

The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.

Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-05-03 16:06:14 +02:00
Tor Lillqvist 04ca42f87b Make it possible to just build the native code for Android, no Java bits
Change-Id: Ic25b8d72c9e60c0bee04765d51565c2864ec25ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95850
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-11 06:48:01 +02:00
Luboš Luňák 0adc9b615f GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.

Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-16 14:49:45 +01:00
Miklos Vajna 3f5a4c8cf2 android: don't try to copy the apk if it does not exist
Linking obj/local/armeabi-v7a/liblo-native-code.so
cp: cannot stat 'android/source/build/outputs/apk/strippedUI/release/*-release-unsigned.apk': No such file or directory
make[1]: *** [android/CustomTarget_lo_android.mk:19: workdir/CustomTarget/android/source/done] Error 1

Change-Id: I90818d432cab0ef8ef7049b6be175db9e9028261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86170
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2020-01-03 16:53:07 +01:00
Jan Holesovsky f362a3d8cc android: Fix non-debug build.
Change-Id: If8bb944417da9a0aa6343d7dc87e7a1931689f1f
Reviewed-on: https://gerrit.libreoffice.org/74149
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2019-06-18 12:31:10 +02:00
Stephan Bergmann 25a0ae6138 Introduce --enable-android-editing
...to select the experimental ...Editing... Android build variant.  (Ignored
for non-Android builds, but using libo_FUZZ_ARG_ENABLE anyway, just in case.)

Change-Id: I670925ff358039e38edc29db69f48a78d484f133
Reviewed-on: https://gerrit.libreoffice.org/65077
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-13 13:29:40 +01:00
Christian Lohmaier a0f74a184f adjust path to generated apk to new defaults
current android-gradle plugin creates the apk in dimension/flavor/variant
(whatever you want to call it) specific directory

Change-Id: I5514fe53c5c8c556d194a0f06ad6167b0b1cc98e
2018-01-18 22:02:22 +01: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
Tor Lillqvist ab8cbb6cc1 Let's simplify the paths and be less 'experimental' 2015-05-21 17:10:19 +01:00
Tor Lillqvist bfceafa67e Bin obsolete comments 2015-02-01 13:43:55 +01:00
Tor Lillqvist 1895fd2195 Copy only *-debug.apk
We don't want the silly 'unaligned' apk to end up being uploaded.
2015-02-01 13:41:48 +01:00
Jan Holesovsky 722d4f0cab android: Fix release build via top level 'make'.
Change-Id: I342e3dfd1e142d4be14162fd8a68876d038ed5ea
2015-01-26 10:27:41 +01:00
Tomaž Vajngerl a6ecd8b2a9 LOAndroid3: ant/make for building, Bootstrap project
LOAndroid3 is based of LibreOffice4Android project which uses
ant/make for building. By using LibreOffice4Android as the base,
the project creates a APK archive which has all needed files
to start LibreOffice in Android environment.

Change-Id: I697d5f727bdaf93e774144ad597d7081d2609908
2014-06-30 14:48:03 +02:00