summaryrefslogtreecommitdiffstats
path: root/config_host
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2019-11-20 16:06:13 +0100
committerJan Holesovsky <kendy@collabora.com>2019-11-27 15:52:35 +0100
commitbd8fcf5b47070a55b41a9953385f6197b4e8fda5 (patch)
treeb6b5500df77edc2439505b18a4b4248ee5c6a0bc /config_host
parentRemoved duplicated include (diff)
downloadcore-bd8fcf5b47070a55b41a9953385f6197b4e8fda5.tar.gz
core-bd8fcf5b47070a55b41a9953385f6197b4e8fda5.zip
android: Introduce --enable-android-lok configure switch to fix RGB vs. BGR.
This indicates that the build targets the Online-based Android app, for which we need to avoid various tweaks that are needed for the 'old' Android app present in the android/ subdir of core.git. In particular, the switch used in this patch fixes a RGBA vs. BGRA confusion that caused yellow <-> cyan switch in the Online-based Android app. Change-Id: I5f394868f51ce87013677834cfafb967b9bb333e Reviewed-on: https://gerrit.libreoffice.org/83342 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 49002a143a4534df5f6139e07fefd06174621c59) Reviewed-on: https://gerrit.libreoffice.org/83718 Tested-by: Jenkins
Diffstat (limited to 'config_host')
-rw-r--r--config_host/config_features.h.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 85196574021b..c0d24e392eae 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -151,4 +151,10 @@
*/
#define HAVE_FEATURE_UPDATE_MAR 0
+/*
+ * Whether we are avoiding the tweaks needed for the Android app from the
+ * android/ subdir.
+ */
+#define HAVE_FEATURE_ANDROID_LOK 0
+
#endif