diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-20 16:06:13 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-18 17:43:03 +0200 |
| commit | e688b4259deacd8005d98f8497ea3101ffe4fd11 (patch) | |
| tree | 9da19854a35fdc0901e4527f13ec0bf1a952b5bf /external | |
| parent | 68fc9688f36f420e16f87de4da3b3ce75288b76c (diff) | |
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 'external')
| -rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 9cd795fc4a0b..8e45e9c28c1d 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -23,7 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ )) endif -ifeq ($(OS),ANDROID) +# To be applied only when ENABLE_ANDROID_LOK is not defined +ifeq ($(OS)$(ENABLE_ANDROID_LOK),ANDROID) $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ external/cairo/cairo/cairo.GL_RGBA.patch \ )) |