Introduce INCLUDE: in the distro-configs...

...to be able to have a common base for things, and then apply some
additional stuff on top - in this case the Android branding for the CP
builds.

Change-Id: I43118bba84fddb8508cc4688c83c2d81a103d781
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88440
Tested-by: Jan Holesovsky <kendy@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 8dd75f47d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88400
Tested-by: Jenkins

autogen.sh

@@ -84,6 +84,13 @@ sub read_args($)
                     print STDERR "  $opt\n";
                 }
             }
+        } elsif ( /^INCLUDE:(.*)/ ) {
+            # include another .conf into this one
+            my $config = "$src_path/distro-configs/$1.conf";
+            if (! -f $config) {
+                invalid_distro ($config, $1);
+            }
+            push @lst, read_args ($config);
         } elsif ( substr($_, 0, 1) eq "#" ) {
             # comment
         } elsif ( length == 0 ) {

distro-configs/CPAndroid.conf

@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroid.conf as the base
+INCLUDE:LibreOfficeAndroid
+# Add the CP stuff
+INCLUDE:CPAndroidBranding

distro-configs/CPAndroidAarch64.conf

@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroidAarch64.conf as the base
+INCLUDE:LibreOfficeAndroidAarch64
+# Add the CP stuff
+INCLUDE:CPAndroidBranding

distro-configs/CPAndroidBranding.conf

@@ -0,0 +1,12 @@
+# CP specific stuff
+--build=x86_64-unknown-linux-gnu
+--disable-odk
+--enable-android-lok
+--with-android-api-level=21
+--with-android-package-name=com.collabora.libreoffice
+--with-vendor=Collabora
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--with-lang=de en-US es pt-BR
+--with-myspell-dicts
+--enable-release-build