diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-11-20 16:06:13 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-11-25 22:31:17 +0100 |
| commit | 49002a143a4534df5f6139e07fefd06174621c59 (patch) | |
| tree | 6384bb88ac2411d28fa14b92758233e8f69bcd3c /external | |
| parent | svtools: encode Base64 the images of the items of the control "ValueSet" (diff) | |
| download | core-49002a143a4534df5f6139e07fefd06174621c59.tar.gz core-49002a143a4534df5f6139e07fefd06174621c59.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>
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 2807cebd177c..7d3537bbc4fb 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -24,7 +24,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 \ )) |