Age | Commit message (Collapse) | Author |
|
Otherwise, upgrading to Android Gradle Plugin 7.1.3 and
gradle 7.2 (which will be done in a follow-up commit)
would make the build fail like this:
> FAILURE: Build failed with an exception.
>
> * Where:
> Build file '/home/michi/development/git/libreoffice-WORKTREE-for-android-x86/android/source/build.gradle' line: 1
>
> * What went wrong:
> A problem occurred evaluating root project 'source'.
> > Failed to apply plugin 'com.android.internal.application'.
> > ANDROID_SDK_HOME is set to the root of your SDK: /home/michi/Android/Sdk
> ANDROID_SDK_HOME was meant to be the parent path of the preference folder expected by the Android tools.
> It is now deprecated.
>
> To set a custom preference folder location, use ANDROID_USER_HOME.
>
> It should NOT be set to the same directory as the root of your SDK.
> To set a custom SDK location, use ANDROID_HOME.
We don't actually rely on `ANDROID_SDK_HOME` being evaluated
by the Android toolchain, but it used to be set in configure.ac,
and the value was then assigned to the `sdk.dir` property written to
`android/source/local.properties`.
Just use a new variable name `ANDROID_SDK_DIR`
and keep the mechanism otherwise unchanged for now.
Change-Id: I44826621a1342119d40036fb704d8ff1eeed7c77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133178
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
|
To complete commit 0ef94e2b559547bc4e906e7f24e57ff5d642e108
and f12096272e684ddcd8ffa4e34dcb0a680cc594c2
Change-Id: Ie86bbfbd58dd728a013bef221e4d5c8fbcaf8e03
Reviewed-on: https://gerrit.libreoffice.org/37199
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
|
|
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
|
|
Change-Id: I786fd580b3d08fa076eeb2bf90bd23b09c9f8182
|
|
Change-Id: I4144d0ed42a50be4fa91f377f78a20c28fda36f6
|
|
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
|
|
To sign, do:
cd android
make key=<your_key_name> sign
Change-Id: I20214e034f997125ccfd122b97d18ae141130336
|
|
Just build the sdremote app for now. Note that this is a pure Java
app with no dependencies on (native) code (or Java code, for that
matter) from rest of LO.
Probably should drop the separate android/sdremote/Makfile and just do
what it does in android/CustomTarget_sdremote.mk instead.
Adding other Android apps (well, the LibreOffice4Android one likely)
to gbuild will require more complexity as they bundle native code, and
thus should depend on other modules first having been built. If one
wants to go really fancy, one could of course depend on the specific
libraries (and other files) being bundled. Let's see...
Change-Id: If10761479f348c4993eec40b7f8346edb77f0e0d
|