[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - distro-configs/CPAndroidX86.conf

[Jan Holesovsky (via logerrit)]

 distro-configs/CPAndroidX86.conf |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit faa62d6f632e422611af7e084c40532dc18a2bf9
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jul 1 12:38:59 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jul 1 12:42:20 2020 +0200

    android: Add a CP x86 configuration too.
    
    Change-Id: I8d584811244cd613b8637d9dd2cf1bfe1985ecec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97610
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 9213bfce95aa3300d87c5fece638a0d8101c718e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97578

diff --git a/distro-configs/CPAndroidX86.conf b/distro-configs/CPAndroidX86.conf
new file mode 100644
index 000000000000..6fba0d609cfb
--- /dev/null
+++ b/distro-configs/CPAndroidX86.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroidX86.conf as the base
+INCLUDE:LibreOfficeAndroidX86
+# Add the CP stuff
+INCLUDE:CPAndroidBranding