[Libreoffice-commits] core.git: distro-configs/Jenkins

[Christian Lohmaier (via logerrit)]

 distro-configs/Jenkins/android_aarch64     |    2 ++
 distro-configs/Jenkins/android_arm         |    2 ++
 distro-configs/Jenkins/android_common.conf |    6 ++++++
 distro-configs/Jenkins/android_x86         |    2 ++
 distro-configs/Jenkins/android_x86_64      |    2 ++
 5 files changed, 14 insertions(+)

New commits:
commit 346c4104c3ceac9d4f61e2e886d38661fa917742
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Wed Sep 30 18:26:03 2020 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Oct 1 11:50:10 2020 +0200

    add distro-configs for jenkins android builds
    
    Change-Id: I7923c16670d53bb52dac771776093d4b06fd05b9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103725
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/distro-configs/Jenkins/android_aarch64 b/distro-configs/Jenkins/android_aarch64
new file mode 100644
index 000000000000..9655534087f7
--- /dev/null
+++ b/distro-configs/Jenkins/android_aarch64
@@ -0,0 +1,2 @@
+INCLUDE:LibreOfficeAndroidAarch64
+INCLUDE:Jenkins/android_common
diff --git a/distro-configs/Jenkins/android_arm b/distro-configs/Jenkins/android_arm
new file mode 100644
index 000000000000..444f7058fd2d
--- /dev/null
+++ b/distro-configs/Jenkins/android_arm
@@ -0,0 +1,2 @@
+INCLUDE:LibreOfficeAndroid
+INCLUDE:Jenkins/android_common
diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf
new file mode 100644
index 000000000000..b35e5dca819c
--- /dev/null
+++ b/distro-configs/Jenkins/android_common.conf
@@ -0,0 +1,6 @@
+--with-android-sdk=$HOME/Android/Sdk
+--with-android-ndk=$HOME/Android/Sdk/ndk/20.1.5948944
+--with-jdk-home=/etc/alternatives/java_sdk_11
+--enable-android-editing
+CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++
diff --git a/distro-configs/Jenkins/android_x86 b/distro-configs/Jenkins/android_x86
new file mode 100644
index 000000000000..59634ba4f9d2
--- /dev/null
+++ b/distro-configs/Jenkins/android_x86
@@ -0,0 +1,2 @@
+INCLUDE:LibreOfficeAndroidX86
+INCLUDE:Jenkins/android_common
diff --git a/distro-configs/Jenkins/android_x86_64 b/distro-configs/Jenkins/android_x86_64
new file mode 100644
index 000000000000..1fd075fdce38
--- /dev/null
+++ b/distro-configs/Jenkins/android_x86_64
@@ -0,0 +1,2 @@
+INCLUDE:LibreOfficeAndroidX86_64
+INCLUDE:Jenkins/android_common